From dab402f54ac4beab53f329db4f3f3d1b4aa7118a Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 26 Apr 2014 00:51:07 +0000 Subject: [PATCH] MFC r264794: Move xdev knobs from release/arm/release.sh and into an XDEV_FLAGS variable in ${KERNCONF}.conf file. Local changes: Fix XDEV_FLAGS for stable/10 branch, in particular, remove WITH_GCC_BOOTSTRAP=1 and add WITH_GNUCXX=1. Sponsored by: The FreeBSD Foundation git-svn-id: svn://svn.freebsd.org/base/stable/10@264959 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- release/arm/BEAGLEBONE.conf | 1 + release/arm/PANDABOARD.conf | 1 + release/arm/RPI-B.conf | 1 + release/arm/WANDBOARD-QUAD.conf | 1 + release/arm/ZEDBOARD.conf | 1 + release/arm/release.sh | 3 +-- 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index 1fee5e6db..f15ac1f2e 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="BEAGLEBONE" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index b6ffe457f..57e03df31 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="PANDABOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index d7a9dca8b..b2886e439 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="RPI-B" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 4c4a9e973..8efb211ff 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="WANDBOARD-QUAD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index 106ac8f2d..9a1cb6509 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -21,6 +21,7 @@ CHROOTDIR="/scratch" EMBEDDEDBUILD=1 XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="ZEDBOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/release.sh b/release/arm/release.sh index c067fe9f1..c2b2a1b30 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -94,8 +94,7 @@ install_uboot() { main() { # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ - WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \ - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ ${WORLD_FLAGS} xdev # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints -- 2.45.0