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

diff --git a/packages/gcc/gcc-cross.inc b/packages/gcc/gcc-cross.inc
new file mode 100644 (file)
index 0000000..5664227
--- /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 4a78d6f5a417709b9c8d5b03255b5f3ec6874c24..0daff9c9e42796b25f48a19fed5fab971351d825 100644 (file)
--- 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 1179da5bf6c40ba3fba6ef1e2491ed220d177783..2b11b139d1c1c962c83287d4d85b213978c58a91 100644 (file)
--- 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 046675aa05673b9cb6e2e7efb5062fe00060c026..f222f802cfdcec110d50331c3bf7ea2e100bdcf5 100644 (file)
--- 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 85d6630ebac029c8fc245938f64482bf76779d75..50fec076552f1ca93d9d0f73d2e9ebccafd85383 100644 (file)
--- 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 62c4119654aebfdfd1e58fb59e6f775752809d17..566773a54f405cb154f676d303446b9b93919f2a 100644 (file)
--- 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 71a641f47c2cd39f6b9ef4a899271a32c12bf823..6066170a3f450bdfc3472a10b1974b49b7b05c7a 100644 (file)
--- 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 287fdbf5eaad6577fc26ab66d6c1e055a81fa41e..407e3eae7c7c755ae3eb1726841328392e725927 100644 (file)
--- 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 b0e2e71b640acd9aef837b2d4b13631f91893f4b..3d3f016bf0f231c754127f37037e0f1be5e4d4c3 100644 (file)
--- 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 6b8fad72de7777209d73e7b3a7f1c1b3b433af6b..6101b67139afe6cb4e551ac42519c34ab636b106 100644 (file)
--- 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 40ecc3af01dbfb93e61aa495f1d8580d36d11ae6..fbd62368d113713b1b242c3d7e34b54e98156628 100644 (file)
--- 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 5d5f747d6e00c6a8020a30730caabd1f55d134b1..0ff9dc727a93cafb2ee92af5379d57f03d85ac18 100644 (file)
--- 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 3c0f72faf5dcf87c7ebee605ed7bc4049074ebe7..d5daece8d18522f47fec6ac661e1727cd123fb64 100644 (file)
--- 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 d4897d81189d44a95be11f21b3ae99ca08d8e558..d3b6e564c9e489c4c738671135b20eee877e2fbc 100644 (file)
--- 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 62a68fb5a1f6fe48c199a746f3d444560979cb31..53d3f5346ebb01ecbb4faeda8a69c30d0013f72d 100644 (file)
--- 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