gcc: Move -native dependencies into the base gcc version configuration file and create and use EXTRA_OECONF_INITIAL and EXTRA_OECONF_INTERMEDIATE variables

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

12 files changed, 13 insertions, 25 deletions

diff --git a/meta/packages/gcc/gcc-4.2.3.inc b/meta/packages/gcc/gcc-4.2.3.inc
index d4d339b052..f8da4efeda 100644
--- a/meta/packages/gcc/gcc-4.2.3.inc
+++ b/meta/packages/gcc/gcc-4.2.3.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS =+ "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
         file://100-uclibc-conf.patch;patch=1 \
@@ -68,5 +69,7 @@ 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/meta/packages/gcc/gcc-4.3.3.inc b/meta/packages/gcc/gcc-4.3.3.inc
index 06f26274d0..0f7aa880d3 100644
--- a/meta/packages/gcc/gcc-4.3.3.inc
+++ b/meta/packages/gcc/gcc-4.3.3.inc
@@ -2,6 +2,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS =+ "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
         file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
@@ -61,4 +62,5 @@ 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"
diff --git a/meta/packages/gcc/gcc-common.inc b/meta/packages/gcc/gcc-common.inc
index c482826aa0..ea0a48ea0c 100644
--- a/meta/packages/gcc/gcc-common.inc
+++ b/meta/packages/gcc/gcc-common.inc
@@ -3,6 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 
+NATIVEDEPS = ""
+
 inherit autotools gettext
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
diff --git a/meta/packages/gcc/gcc-cross-initial.inc b/meta/packages/gcc/gcc-cross-initial.inc
index a3545417ce..124b323810 100644
--- a/meta/packages/gcc/gcc-cross-initial.inc
+++ b/meta/packages/gcc/gcc-cross-initial.inc
@@ -1,4 +1,4 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
diff --git a/meta/packages/gcc/gcc-cross-initial_4.2.3.bb b/meta/packages/gcc/gcc-cross-initial_4.2.3.bb
index fe326d304b..1639511362 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.2.3.bb
+++ b/meta/packages/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/meta/packages/gcc/gcc-cross-initial_4.3.3.bb b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
index a06398389e..8a429d54fe 100644
--- a/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-initial_4.3.3.bb
@@ -3,13 +3,6 @@ require gcc-cross-initial.inc
 
 PR = "r1"
 
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-                  --disable-decimal-float \
-                  --disable-libgomp \
-                  --disable-libssp"
-
 # Hack till we fix *libc properly
 do_install_append() {
         ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
index 1a921d2d9c..a3664710f1 100644
--- a/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-initial_csl-arm-2008q1.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/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-cross-intermediate.inc b/meta/packages/gcc/gcc-cross-intermediate.inc
index 169419f247..749bd36df4 100644
--- a/meta/packages/gcc/gcc-cross-intermediate.inc
+++ b/meta/packages/gcc/gcc-cross-intermediate.inc
@@ -1,4 +1,4 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
 DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
 PACKAGES = ""
diff --git a/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb b/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb
index 7acca81c3b..eb59de9461 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.2.3.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/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
index 3969dba32d..6de46f7e27 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,11 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 PR = "r1"
-DEPENDS += "gmp-native mpfr-native"
-
-EXTRA_OECONF += " --disable-libmudflap \
-                  --disable-libgomp \
-                  --disable-libssp"
 
 # Hack till we fix *libc properly
 do_install_append() {
diff --git a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
index 0dabd0b8db..b6d3a3a642 100644
--- a/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ b/meta/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.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/* ${D}${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
diff --git a/meta/packages/gcc/gcc-csl-arm-2008q1.inc b/meta/packages/gcc/gcc-csl-arm-2008q1.inc
index d4f6ef1e37..e84bd835d2 100644
--- a/meta/packages/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/packages/gcc/gcc-csl-arm-2008q1.inc
@@ -45,6 +45,9 @@ 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