gcc: Add gcc-cross4.inc and convert gcc-cross_4* recipes to use it

8 files changed, 11 insertions, 30 deletions

diff --git a/packages/gcc/gcc-cross4.inc b/packages/gcc/gcc-cross4.inc
new file mode 100644
index 0000000000..3d3403737a
--- /dev/null
+++ b/packages/gcc/gcc-cross4.inc
@@ -0,0 +1,3 @@
+require gcc-cross.inc
+
+DEPENDS += "gmp-native mpfr-native"
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 2f8c99cbdc..320e247d15 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -2,9 +2,6 @@ PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 94dd182e9c..5379866587 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -2,9 +2,6 @@ PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 4276c169f2..e3d4a51df6 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -2,10 +2,7 @@ PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
 
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index 60985a6283..289252fdc1 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -2,10 +2,7 @@ PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
 
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index b46c39c979..a9bf0b2ff6 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -2,10 +2,7 @@ PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
 
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 140254e8ce..8ddee97ee1 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -2,13 +2,8 @@ PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
-# cross build
+require gcc-cross4.inc
 require gcc3-build-cross.inc
-# cross packaging
 require gcc-package-cross.inc
 
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index e392e72ec9..d1c19f728d 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -2,12 +2,10 @@ PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-cross.inc
-
-DEPENDS += "gmp-native mpfr-native"
-
+require gcc-cross4.inc
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
+
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
 # Do not build libssp libmudflap and libgomp
 # We might need them for some beefy targets