diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-31 12:04:31 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 14:45:35 +0100 |
| commit | ad15cab880e097fddc00ea9bfc22b95480743cc5 (patch) | |
| tree | 56348674c7d231143a5cf8c2e72da0a03cc63d6f | |
| parent | 020bde9e9aec599c0894f11356f3ed10c2d9816c (diff) | |
gcc: Create and use EXTRA_OECONF_INITIAL and EXTRA_OECONF_INTERMEDIATE variables
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
63 files changed, 55 insertions, 156 deletions
diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc index a147d8771b..835465f807 100644 --- a/recipes/gcc/gcc-4.0.0.inc +++ b/recipes/gcc/gcc-4.0.0.inc @@ -12,6 +12,8 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " FORTRAN = ",f95" EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp" SRC_URI[archive.md5sum] = "55ee7df1b29f719138ec063c57b89db6" SRC_URI[archive.sha256sum] = "38a9a01e195000976dcd04ec854c398478ada839510b1de384ffbd5f99791bdc" diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc index 060ce4c3c5..e4b8380fde 100644 --- a/recipes/gcc/gcc-4.0.2.inc +++ b/recipes/gcc/gcc-4.0.2.inc @@ -27,6 +27,8 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " FORTRAN = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp" SRC_URI[archive.md5sum] = "a659b8388cac9db2b13e056e574ceeb0" SRC_URI[archive.sha256sum] = "37b3286c2bfb68da9df983f60721f868e29897f7a426306748fee93b25c5fb61" diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index 8bfd374fbc..d23ecc0f2b 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -16,6 +16,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp" # Language Overrides FORTRAN = "" diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index 1547eeb9c8..5f10cf016a 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -46,6 +46,8 @@ FORTRAN = "" JAVA = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp --disable-libunwind-exceptions" SRC_URI[archive.md5sum] = "ad9f97a4d04982ccf4fd67cb464879f3" SRC_URI[archive.sha256sum] = "985cbb23a486570a8783395a42a8689218f5218a0ccdd6bec590eef341367bb7" diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index b8959aac1b..1360ce32b8 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -57,6 +57,9 @@ FORTRAN = "" JAVA = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp" + ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc index 1a5e30fd27..0e627235b0 100644 --- a/recipes/gcc/gcc-4.2.1.inc +++ b/recipes/gcc/gcc-4.2.1.inc @@ -91,6 +91,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index 6b6591a223..a7e24e9f1f 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -81,6 +81,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index c65726a150..55db03b623 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -71,6 +71,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE += " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index d7e1b8e081..8211c670de 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -85,6 +85,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --enable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" ARM_INSTRUCTION_SET = "arm" diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index ac509a966d..f7b4ee9d53 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -72,6 +72,8 @@ JAVA = "" FORTRAN_linux-gnueabi = ",fortran" EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" SRC_URI[archive.md5sum] = "4afa0290cc3a41ac8822666f1110de98" SRC_URI[archive.sha256sum] = "66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5" diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index cd522d01da..75dc0d7129 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -70,6 +70,8 @@ FORTRAN = "" JAVA = "" EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" SRC_URI[archive.md5sum] = "5dfac5da961ecd5f227c3175859a486d" SRC_URI[archive.sha256sum] = "bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165" diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 6b9c79e465..d4b82dcedc 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -100,6 +100,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" SRC_URI[archive.md5sum] = "cc3c5565fdb9ab87a05ddb106ba0bd1f" SRC_URI[archive.sha256sum] = "309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de" diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index a4a1180e3d..186edce2ff 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -99,6 +99,8 @@ FORTRAN_linux-gnueabi = ",fortran" JAVA = "" EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" SRC_URI[archive.md5sum] = "60df63222dbffd53ca11492a2545044f" SRC_URI[archive.sha256sum] = "e572453bdb74cc4ceebfab9ffb411d9678343dff5bf86e9338d42fdd0818aa65" diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index 4a940e4e20..c84c339653 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -34,6 +34,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \ --disable-bootstrap --disable-libgomp \ --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" + EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--disable-decimal-float --without-long-double-128', '',d)}" SRC_URI[archive.md5sum] = "927eaac3d44b22f31f9c83df82f26436" diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc index 0292bcd85d..1ecdd53abf 100644 --- a/recipes/gcc/gcc-4.4.2.inc +++ b/recipes/gcc/gcc-4.4.2.inc @@ -34,6 +34,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \ --disable-bootstrap --disable-libgomp \ --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" + EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float " diff --git a/recipes/gcc/gcc-4.4.3.inc b/recipes/gcc/gcc-4.4.3.inc index 9f512ed085..c9aa7e20a4 100644 --- a/recipes/gcc/gcc-4.4.3.inc +++ b/recipes/gcc/gcc-4.4.3.inc @@ -37,6 +37,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \ --disable-bootstrap --disable-libgomp \ --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" + EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float " diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index 3ec896bb64..fe8b48655d 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -31,6 +31,8 @@ LANGUAGES ?= "c,c++${OBJC}${FORTRAN}${JAVA}" EXTRA_OECONF_BASE ?= "" EXTRA_OECONF_PATHS ?= "" +EXTRA_OECONF_INITIAL ?= "" +EXTRA_OECONF_INTERMEDIATE ?= "" EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ --with-gnu-ld \ diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 1278b465b6..97002f9784 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -16,6 +16,7 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --program-prefix=${TARGET_PREFIX} \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ + ${EXTRA_OECONF_INITIAL} \ ${@get_gcc_fpu_setting(bb, d)} \ ${@get_gcc_mips_plt_setting(bb, d)}" diff --git a/recipes/gcc/gcc-cross-initial_4.0.0.bb b/recipes/gcc/gcc-cross-initial_4.0.0.bb index dd9071ac02..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.0.0.bb +++ b/recipes/gcc/gcc-cross-initial_4.0.0.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -DEPENDS += "gmp-native mpfr-native" - -EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" - diff --git a/recipes/gcc/gcc-cross-initial_4.0.2.bb b/recipes/gcc/gcc-cross-initial_4.0.2.bb index 6407c4cc64..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.0.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.0.2.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" - diff --git a/recipes/gcc/gcc-cross-initial_4.1.0.bb b/recipes/gcc/gcc-cross-initial_4.1.0.bb index 1c1d094382..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.1.0.bb +++ b/recipes/gcc/gcc-cross-initial_4.1.0.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.1.1.bb b/recipes/gcc/gcc-cross-initial_4.1.1.bb index 1c1d094382..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.1.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.1.1.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.1.2.bb b/recipes/gcc/gcc-cross-initial_4.1.2.bb index 30f77b7441..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.1.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.1.2.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-initial_4.2.1.bb b/recipes/gcc/gcc-cross-initial_4.2.1.bb index fe326d304b..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.2.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.2.1.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.2.2.bb b/recipes/gcc/gcc-cross-initial_4.2.2.bb index fe326d304b..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.2.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.2.2.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.2.3.bb b/recipes/gcc/gcc-cross-initial_4.2.3.bb index fe326d304b..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.2.3.bb +++ b/recipes/gcc/gcc-cross-initial_4.2.3.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.2.4.bb b/recipes/gcc/gcc-cross-initial_4.2.4.bb index 7e9e1c3972..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.2.4.bb +++ b/recipes/gcc/gcc-cross-initial_4.2.4.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-initial_4.3.1.bb b/recipes/gcc/gcc-cross-initial_4.3.1.bb index dbacfe3214..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.1.bb @@ -1,8 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-initial_4.3.2.bb b/recipes/gcc/gcc-cross-initial_4.3.2.bb index dbacfe3214..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.2.bb @@ -1,8 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-initial_4.3.3.bb b/recipes/gcc/gcc-cross-initial_4.3.3.bb index 8ee2e6eec8..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.3.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.3.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.3.4.bb b/recipes/gcc/gcc-cross-initial_4.3.4.bb index 8ee2e6eec8..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.4.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.4.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.4.1.bb b/recipes/gcc/gcc-cross-initial_4.4.1.bb index dbacfe3214..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.1.bb @@ -1,8 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-initial_4.4.2.bb b/recipes/gcc/gcc-cross-initial_4.4.2.bb index 8ee2e6eec8..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.2.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_4.4.3.bb b/recipes/gcc/gcc-cross-initial_4.4.3.bb index 8ee2e6eec8..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.3.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.3.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb index 2a5d4fc0cc..af4fcbb5c1 100644 --- a/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb +++ b/recipes/gcc/gcc-cross-initial_csl-arm-2006q1.bb @@ -2,6 +2,3 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc S = "${WORKDIR}/gcc-2006q1" - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb index 22ec008046..2019def10c 100644 --- a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb @@ -3,8 +3,6 @@ require gcc-cross-initial.inc S = "${WORKDIR}/gcc-4.2" -EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - # Hack till we fix *libc properly do_install_append() { ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb index c9f03a7920..773fc172e6 100644 --- a/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross-initial_csl-arm-2008q1.bb @@ -2,5 +2,3 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc S = "${WORKDIR}/gcc-4.2" - -EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb index 8ee2e6eec8..1639511362 100644 --- a/recipes/gcc/gcc-cross-initial_svn.bb +++ b/recipes/gcc/gcc-cross-initial_svn.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --enable-decimal-float=no \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 866ef467ae..0c06d6f9da 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -14,6 +14,7 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --program-prefix=${TARGET_PREFIX} \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET} \ + ${EXTRA_OECONF_INTERMEDIATE} \ ${@get_gcc_fpu_setting(bb, d)} \ ${@get_gcc_mips_plt_setting(bb, d)}" diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb index 73256f8f7f..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.0.0.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.0.0.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb index 73256f8f7f..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.0.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.0.2.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.0.bb b/recipes/gcc/gcc-cross-intermediate_4.1.0.bb index 3e103aa24e..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.1.0.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.1.0.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.1.bb b/recipes/gcc/gcc-cross-intermediate_4.1.1.bb index 837237e7d4..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.1.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.1.1.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libunwind-exceptions \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.1.2.bb b/recipes/gcc/gcc-cross-intermediate_4.1.2.bb index 3e103aa24e..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.1.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.1.2.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.1.bb b/recipes/gcc/gcc-cross-intermediate_4.2.1.bb index 1bdb6f4fd4..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.2.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.2.1.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.2.bb b/recipes/gcc/gcc-cross-intermediate_4.2.2.bb index 7acca81c3b..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.2.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.2.2.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.3.bb b/recipes/gcc/gcc-cross-intermediate_4.2.3.bb index 1bdb6f4fd4..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.2.3.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.2.3.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.2.4.bb b/recipes/gcc/gcc-cross-intermediate_4.2.4.bb index 7acca81c3b..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.2.4.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.2.4.bb @@ -1,5 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb index a909fa72fd..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb index d45f2b3abe..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb index d45f2b3abe..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp" - diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb index a909fa72fd..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb index 13810b2105..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb @@ -1,8 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp \ - " - diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb index 51c12aef4f..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp \ - " diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb index 51c12aef4f..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb @@ -1,7 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp \ - " diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb index 2d4b55f997..6db4c71c37 100644 --- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb +++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb @@ -2,6 +2,3 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc S = "${WORKDIR}/gcc-2006q1" - -EXTRA_OECONF += "--disable-libmudflap \ - --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb index 5758df33d3..7bcf5d2396 100644 --- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb @@ -3,8 +3,6 @@ require gcc-cross-intermediate.inc S = "${WORKDIR}/gcc-4.2" -EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " - # Hack till we fix *libc properly do_install_append() { ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/ diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb index 5423626a99..793f546f3b 100644 --- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb @@ -2,5 +2,3 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc S = "${WORKDIR}/gcc-4.2" - -EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap " diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb index a909fa72fd..eb59de9461 100644 --- a/recipes/gcc/gcc-cross-intermediate_svn.bb +++ b/recipes/gcc/gcc-cross-intermediate_svn.bb @@ -1,6 +1,2 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libgomp \ - --disable-libssp" diff --git a/recipes/gcc/gcc-csl-arm-2006q1.inc b/recipes/gcc/gcc-csl-arm-2006q1.inc index e7b78ee2c8..b20331a43f 100644 --- a/recipes/gcc/gcc-csl-arm-2006q1.inc +++ b/recipes/gcc/gcc-csl-arm-2006q1.inc @@ -17,5 +17,9 @@ do_unpack2() { } addtask unpack2 after do_unpack before do_patch + SRC_URI[archive.md5sum] = "c0d60035d45c7f43d2ddd3c021709220" SRC_URI[archive.sha256sum] = "693609f59d0c0a6518a3654314aaef841305e029c8f7de4c42fbc0fd7f2dbb35" + +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libssp" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libssp" diff --git a/recipes/gcc/gcc-csl-arm-2007q3.inc b/recipes/gcc/gcc-csl-arm-2007q3.inc index 98edfff1a5..f637ad932e 100644 --- a/recipes/gcc/gcc-csl-arm-2007q3.inc +++ b/recipes/gcc/gcc-csl-arm-2007q3.inc @@ -47,6 +47,10 @@ FORTRAN = "" #JAVA = ",java" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" + + ARM_INSTRUCTION_SET = "arm" addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-csl-arm-2008q1.inc b/recipes/gcc/gcc-csl-arm-2008q1.inc index 8209cc9c34..a0d4ec6eb6 100644 --- a/recipes/gcc/gcc-csl-arm-2008q1.inc +++ b/recipes/gcc/gcc-csl-arm-2008q1.inc @@ -45,6 +45,10 @@ FORTRAN = "" #JAVA = ",java" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap" + + ARM_INSTRUCTION_SET = "arm" addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index 3a9a0e2282..eff9306787 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -29,6 +29,9 @@ EXTRA_OECONF_BASE = " --enable-libssp \ --disable-bootstrap --disable-libgomp \ --disable-libmudflap" +EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no" +EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp" + rename_srcdir (){ mv ${WORKDIR}/trunk ${WORKDIR}/gcc-${PV} } |