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 4a78d6f..0daff9c 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 1179da5..2b11b13 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 046675a..f222f80 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 85d6630..50fec07 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 62c4119..566773a 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 71a641f..6066170 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 287fdbf..407e3ea 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 b0e2e71..3d3f016 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 6b8fad7..6101b67 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 40ecc3a..fbd6236 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 5d5f747..0ff9dc7 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 3c0f72f..d5daece 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 d4897d8..d3b6e56 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 62a68fb..53d3f53 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