gcc: Move -native dependencies into the base gcc version configuration file

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

35 files changed, 20 insertions, 34 deletions

diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc
index 2267826c42..a147d8771b 100644
--- a/recipes/gcc/gcc-4.0.0.inc
+++ b/recipes/gcc/gcc-4.0.0.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://gcc-posix-open-fix.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc
index 01b6f77e9b..060ce4c3c5 100644
--- a/recipes/gcc/gcc-4.0.2.inc
+++ b/recipes/gcc/gcc-4.0.2.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://gcc-posix-open-fix.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc
index 53d6052953..1547eeb9c8 100644
--- a/recipes/gcc/gcc-4.1.1.inc
+++ b/recipes/gcc/gcc-4.1.1.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r1"
 
diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 3cec5a6c4a..b8959aac1b 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r22"
 
diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc
index 87d9b43354..1a5e30fd27 100644
--- a/recipes/gcc/gcc-4.2.1.inc
+++ b/recipes/gcc/gcc-4.2.1.inc
@@ -1,6 +1,7 @@
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://100-uclibc-conf.patch;patch=1 \
diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc
index c80342cd49..6b6591a223 100644
--- a/recipes/gcc/gcc-4.2.2.inc
+++ b/recipes/gcc/gcc-4.2.2.inc
@@ -2,6 +2,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r16"
 
diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc
index 955a894106..c65726a150 100644
--- a/recipes/gcc/gcc-4.2.3.inc
+++ b/recipes/gcc/gcc-4.2.3.inc
@@ -2,6 +2,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r17"
 
diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
index e31c0d46c8..d7e1b8e081 100644
--- a/recipes/gcc/gcc-4.2.4.inc
+++ b/recipes/gcc/gcc-4.2.4.inc
@@ -2,6 +2,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r10"
 
diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc
index 720e46fc8e..ac509a966d 100644
--- a/recipes/gcc/gcc-4.3.1.inc
+++ b/recipes/gcc/gcc-4.3.1.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r20"
 
diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc
index 9f7d5510cf..cd522d01da 100644
--- a/recipes/gcc/gcc-4.3.2.inc
+++ b/recipes/gcc/gcc-4.3.2.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r10"
 
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 6725e19957..6b9c79e465 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r11"
 
diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc
index d214bfb1dc..a4a1180e3d 100644
--- a/recipes/gcc/gcc-4.3.4.inc
+++ b/recipes/gcc/gcc-4.3.4.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r8"
 
diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc
index 5cae2a9f6e..4a940e4e20 100644
--- a/recipes/gcc/gcc-4.4.1.inc
+++ b/recipes/gcc/gcc-4.4.1.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r8"
 
diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc
index 75e63af55d..0292bcd85d 100644
--- a/recipes/gcc/gcc-4.4.2.inc
+++ b/recipes/gcc/gcc-4.4.2.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r2"
 
diff --git a/recipes/gcc/gcc-4.4.3.inc b/recipes/gcc/gcc-4.4.3.inc
index 25098d523b..9f512ed085 100644
--- a/recipes/gcc/gcc-4.4.3.inc
+++ b/recipes/gcc/gcc-4.4.3.inc
@@ -6,6 +6,7 @@ require gcc-common.inc
 LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
+NATIVEDEPS = "mpfr-native gmp-native"
 
 INC_PR = "r0"
 
diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc
index 97b140cb0f..7aee542461 100644
--- a/recipes/gcc/gcc-common.inc
+++ b/recipes/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/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc
index abe82c693b..1278b465b6 100644
--- a/recipes/gcc/gcc-cross-initial.inc
+++ b/recipes/gcc/gcc-cross-initial.inc
@@ -1,4 +1,4 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
diff --git a/recipes/gcc/gcc-cross-initial_4.3.1.bb b/recipes/gcc/gcc-cross-initial_4.3.1.bb
index 22f500af62..dbacfe3214 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.1.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.3.2.bb b/recipes/gcc/gcc-cross-initial_4.3.2.bb
index 22f500af62..dbacfe3214 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.2.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.3.3.bb b/recipes/gcc/gcc-cross-initial_4.3.3.bb
index 067ab61be3..8ee2e6eec8 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.3.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.3.4.bb b/recipes/gcc/gcc-cross-initial_4.3.4.bb
index 067ab61be3..8ee2e6eec8 100644
--- a/recipes/gcc/gcc-cross-initial_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-initial_4.3.4.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.4.1.bb b/recipes/gcc/gcc-cross-initial_4.4.1.bb
index 22f500af62..dbacfe3214 100644
--- a/recipes/gcc/gcc-cross-initial_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-initial_4.4.1.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.4.2.bb b/recipes/gcc/gcc-cross-initial_4.4.2.bb
index 067ab61be3..8ee2e6eec8 100644
--- a/recipes/gcc/gcc-cross-initial_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-initial_4.4.2.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_4.4.3.bb b/recipes/gcc/gcc-cross-initial_4.4.3.bb
index 067ab61be3..8ee2e6eec8 100644
--- a/recipes/gcc/gcc-cross-initial_4.4.3.bb
+++ b/recipes/gcc/gcc-cross-initial_4.4.3.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb
index 8356dd1fac..8ee2e6eec8 100644
--- a/recipes/gcc/gcc-cross-initial_svn.bb
+++ b/recipes/gcc/gcc-cross-initial_svn.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-initial.inc
 
-DEPENDS += "gmp-native mpfr-native libmpc-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --enable-decimal-float=no \
diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc
index 1ccf90233c..866ef467ae 100644
--- a/recipes/gcc/gcc-cross-intermediate.inc
+++ b/recipes/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"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
 PACKAGES = ""
diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
index a9ae5bdf20..a909fa72fd 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 5f55396867..d45f2b3abe 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 5f55396867..d45f2b3abe 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 a9ae5bdf20..a909fa72fd 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 86e9a430ce..13810b2105 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 3ca59aa02f..51c12aef4f 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 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 3ca59aa02f..51c12aef4f 100644
--- a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --disable-libssp \
diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb
index b816c8b81c..a909fa72fd 100644
--- a/recipes/gcc/gcc-cross-intermediate_svn.bb
+++ b/recipes/gcc/gcc-cross-intermediate_svn.bb
@@ -1,8 +1,6 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
 
-DEPENDS += "libmpc-native gmp-native mpfr-native"
-
 EXTRA_OECONF += " --disable-libmudflap \
 		  --disable-libgomp \
 		  --disable-libssp"
diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc
index 39f5c66afb..3a9a0e2282 100644
--- a/recipes/gcc/gcc-svn.inc
+++ b/recipes/gcc/gcc-svn.inc
@@ -6,6 +6,7 @@ SRCREV = "158653"
 require gcc-common.inc
 
 DEPENDS = "mpfr gmp libmpc"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
 
 BINV = "4.6.0"
 PV = "4.6+svnr${SRCPV}"