gcc: Add gcc-cross.inc taking some common code from all gcc-cross packages

15 files changed, 26 insertions, 96 deletions

diff --git a/packages/gcc/gcc-cross.inc b/packages/gcc/gcc-cross.inc
new file mode 100644
index 0000000000..566422769d
--- /dev/null
+++ b/packages/gcc/gcc-cross.inc
@@ -0,0 +1,6 @@
+# path mangling, needed by the cross packaging
+require gcc-paths-cross.inc
+inherit cross
+
+DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 4a78d6f5a4..0daff9c9e4 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,3 @@
-SECTION = "devel"
 require gcc-${PV}.inc
 require gcc-package-target.inc
 inherit cross
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 1179da5bf6..2b11b139d1 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,14 +1,9 @@
-SECTION = "devel"
 require gcc-${PV}.inc
 require gcc-package-target.inc
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 
 PR="r6"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 require gcc3-build-cross.inc
 require gcc-package-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 046675aa05..f222f802cf 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,16 +1,9 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r13"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 # cross build
 require gcc3-build-cross.inc
 # cross packaging
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index 85d6630eba..50fec07655 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,16 +1,9 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r8"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 # cross build
 require gcc3-build-cross.inc
 # cross packaging
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index 62c4119654..566773a54f 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r4"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index 71a641f47c..6066170a3f 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r10"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index 287fdbf5ea..407e3eae7c 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r5"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index b0e2e71b64..3d3f016bf0 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r18"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index 6b8fad72de..6101b67139 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .bb changes something that affects its *build*
-# remember to increment this one too.
 PR = "r14"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 40ecc3af01..fbd62368d1 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r13"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 5d5f747d6e..0ff9dc727a 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,15 +1,10 @@
 require gcc-${PV}.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
+require gcc-cross.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
 PR = "r6"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
+DEPENDS += "gmp-native mpfr-native"
 
 # cross build
 require gcc3-build-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 3c0f72faf5..d5daece8d1 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,15 +1,8 @@
 require gcc-csl-arm-2005q3.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
+require gcc-cross.inc
 PR = "r2"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 # cross build
 require gcc3-build-cross.inc
 # cross packaging
diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb
index d4897d8118..d3b6e564c9 100644
--- a/packages/gcc/gcc-cross_csl-arm-cvs.bb
+++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb
@@ -1,15 +1,8 @@
 require gcc-csl-arm-cvs.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
+require gcc-cross.inc
 PR = "r1"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 # cross build
 require gcc3-build-cross.inc
 # cross packaging
diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb
index 62a68fb5a1..53d3f5346e 100644
--- a/packages/gcc/gcc-cross_csl-arm.bb
+++ b/packages/gcc/gcc-cross_csl-arm.bb
@@ -1,15 +1,8 @@
 require gcc-csl-arm.inc
 require gcc-package-target.inc
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
-inherit cross
-# NOTE: split PR.  If the main .oe changes something that affects its *build*
-# remember to increment this one too.
+require gcc-cross.inc
 PR = "r1"
 
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
 # cross build
 require gcc3-build-cross.inc
 # cross packaging