diff options
43 files changed, 63 insertions, 65 deletions
diff --git a/packages/gcc/gcc-3.3.3.inc b/packages/gcc/gcc-3.3.3.inc index 443cfc5975..ef8284c0e5 100644 --- a/packages/gcc/gcc-3.3.3.inc +++ b/packages/gcc/gcc-3.3.3.inc @@ -1,7 +1,5 @@ require gcc-common.inc -PR = "r3" - SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://config.sub.patch;patch=1 \ file://empty6.patch;patch=1 \ diff --git a/packages/gcc/gcc-3.3.4.inc b/packages/gcc/gcc-3.3.4.inc index baab2a53d8..db10dbe9bf 100644 --- a/packages/gcc/gcc-3.3.4.inc +++ b/packages/gcc/gcc-3.3.4.inc @@ -1,7 +1,5 @@ require gcc-common.inc -PR = "r3" - SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-gotoff.dpatch;patch=1;pnum=0 \ file://arm-ldm.dpatch;patch=1;pnum=0 \ diff --git a/packages/gcc/gcc-3.4.3.inc b/packages/gcc/gcc-3.4.3.inc index 1dc7056d89..748498c12e 100644 --- a/packages/gcc/gcc-3.4.3.inc +++ b/packages/gcc/gcc-3.4.3.inc @@ -1,7 +1,5 @@ require gcc-common.inc -PR = "r12" - SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ file://gcc34-arm-ldm.patch;patch=1 \ diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc index cb96e6f2d1..b529917607 100644 --- a/packages/gcc/gcc-3.4.4.inc +++ b/packages/gcc/gcc-3.4.4.inc @@ -1,7 +1,5 @@ require gcc-common.inc -PR = "r7" - SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ file://gcc34-arm-ldm.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.0.0.inc b/packages/gcc/gcc-4.0.0.inc index da097b7e00..511af4e618 100644 --- a/packages/gcc/gcc-4.0.0.inc +++ b/packages/gcc/gcc-4.0.0.inc @@ -1,5 +1,4 @@ require gcc-common.inc -PR = "r3" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://zecke-xgcc-cpp.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.0.2.inc b/packages/gcc/gcc-4.0.2.inc index ec97954992..078ad2cc71 100644 --- a/packages/gcc/gcc-4.0.2.inc +++ b/packages/gcc/gcc-4.0.2.inc @@ -1,7 +1,6 @@ require gcc-common.inc DEPENDS = "mpfr gmp" -PR = "r7" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.1.0.inc b/packages/gcc/gcc-4.1.0.inc index 45b8c142cc..218ad48a1a 100644 --- a/packages/gcc/gcc-4.1.0.inc +++ b/packages/gcc/gcc-4.1.0.inc @@ -1,5 +1,4 @@ require gcc-common.inc -PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gcc/gcc-4.1.1.inc b/packages/gcc/gcc-4.1.1.inc index 3c369f04bc..6796eea9ce 100644 --- a/packages/gcc/gcc-4.1.1.inc +++ b/packages/gcc/gcc-4.1.1.inc @@ -1,5 +1,4 @@ require gcc-common.inc -PR = "r18" SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.1.2.inc b/packages/gcc/gcc-4.1.2.inc index 1059e74de0..995289d477 100644 --- a/packages/gcc/gcc-4.1.2.inc +++ b/packages/gcc/gcc-4.1.2.inc @@ -1,7 +1,4 @@ require gcc-common.inc -# NOTE: split PR. If the main .bb changes something that affects its *build* -# remember to increment the -cross .bb PR too. -PR = "r11" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.2.1.inc b/packages/gcc/gcc-4.2.1.inc index ae1f99adf1..3d08efbc65 100644 --- a/packages/gcc/gcc-4.2.1.inc +++ b/packages/gcc/gcc-4.2.1.inc @@ -1,5 +1,4 @@ require gcc-common.inc -PR = "r9" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index 593ae546c3..79277d3a06 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -1,7 +1,5 @@ require gcc-common.inc -PR = "r6" - SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index 0daff9c9e4..068fcffe3b 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -1,3 +1,5 @@ +PR = "r3" + 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 2b11b139d1..fef925edcc 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,9 +1,8 @@ +PR="r6" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" - -PR="r6" - 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 f222f802cf..dbd23ffa9d 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -1,10 +1,8 @@ +PR = "r13" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r13" - -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index 50fec07655..2982f0f73e 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -1,10 +1,8 @@ +PR = "r8" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r8" - -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 566773a54f..2bec608de7 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -1,12 +1,12 @@ +PR = "r4" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r4" DEPENDS += "gmp-native mpfr-native" -# cross build require gcc3-build-cross.inc -# cross packaging 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 6066170a3f..2152734199 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -1,12 +1,12 @@ +PR = "r10" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r10" DEPENDS += "gmp-native mpfr-native" -# cross build require gcc3-build-cross.inc -# cross packaging 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 407e3eae7c..d22c471627 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -1,14 +1,14 @@ +PR = "r5" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r5" DEPENDS += "gmp-native mpfr-native" -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 3d3f016bf0..b108e503b8 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -1,14 +1,14 @@ +PR = "r18" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r18" DEPENDS += "gmp-native mpfr-native" -# cross build 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.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 6101b67139..def27cf2dd 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -1,14 +1,13 @@ +PR = "r14" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r14" DEPENDS += "gmp-native mpfr-native" -# cross build 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.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index fbd62368d1..3dd14e1254 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -1,8 +1,9 @@ +PR = "r13" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r13" DEPENDS += "gmp-native mpfr-native" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 0ff9dc727a..b2b2bbd4d1 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -1,14 +1,13 @@ +PR = "r6" + require gcc-${PV}.inc require gcc-package-target.inc require gcc-cross.inc -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -PR = "r6" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS += "gmp-native mpfr-native" -# cross build 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 " # Do not build libssp libmudflap and libgomp diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index d5daece8d1..9c062700b3 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,9 +1,7 @@ +PR = "r2" + require gcc-csl-arm-2005q3.inc require gcc-package-target.inc require gcc-cross.inc -PR = "r2" - -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index d3b6e564c9..6ff1ec66d7 100644 --- a/packages/gcc/gcc-cross_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -1,9 +1,7 @@ +PR = "r1" + require gcc-csl-arm-cvs.inc require gcc-package-target.inc require gcc-cross.inc -PR = "r1" - -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb index 53d3f5346e..02af390869 100644 --- a/packages/gcc/gcc-cross_csl-arm.bb +++ b/packages/gcc/gcc-cross_csl-arm.bb @@ -1,9 +1,7 @@ +PR = "r1" + require gcc-csl-arm.inc require gcc-package-target.inc require gcc-cross.inc -PR = "r1" - -# cross build require gcc3-build-cross.inc -# cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-csl-arm-2005q3.inc b/packages/gcc/gcc-csl-arm-2005q3.inc index 5231ee57d2..bcff26519b 100644 --- a/packages/gcc/gcc-csl-arm-2005q3.inc +++ b/packages/gcc/gcc-csl-arm-2005q3.inc @@ -2,7 +2,6 @@ require gcc-common.inc BINV = "3.4.4" PV = "3.4.4+csl-arm-2005q3" PV_chinook-compat = "3.4.4cs2005q3.2" -PR = "r3" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" diff --git a/packages/gcc/gcc-csl-arm-cvs.inc b/packages/gcc/gcc-csl-arm-cvs.inc index 334ae9c728..a575fcbbc0 100644 --- a/packages/gcc/gcc-csl-arm-cvs.inc +++ b/packages/gcc/gcc-csl-arm-cvs.inc @@ -5,6 +5,4 @@ BINV = "3.4.4" SRC_URI += "file://15342.patch;patch=1 file://gcc-3.4.0-arm-lib1asm.patch;patch=1 file://no-libfloat.patch;patch=1" -PR = "r1" - DEFAULT_PREFERENCE = "-1" diff --git a/packages/gcc/gcc-csl-arm.inc b/packages/gcc/gcc-csl-arm.inc index eda4335426..c9e68dfe6d 100644 --- a/packages/gcc/gcc-csl-arm.inc +++ b/packages/gcc/gcc-csl-arm.inc @@ -1,7 +1,6 @@ require gcc-common.inc BINV = "3.4.4" PV = "3.4.4+csl-arm-${SRCDATE}" -PR = "r1" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" DEFAULT_PREFERENCE = "-1" diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb index f20937d60c..dd4402dccf 100644 --- a/packages/gcc/gcc-native_3.4.4.bb +++ b/packages/gcc/gcc-native_3.4.4.bb @@ -1,3 +1,5 @@ +PR = "r7" + require gcc-${PV}.inc require gcc-native.inc PROVIDES += "gcc3-native" diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb index d6f35bb290..0a29996c09 100644 --- a/packages/gcc/gcc_3.3.3.bb +++ b/packages/gcc/gcc_3.3.3.bb @@ -1,2 +1,4 @@ +PR = "r3" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb index d6f35bb290..0a29996c09 100644 --- a/packages/gcc/gcc_3.3.4.bb +++ b/packages/gcc/gcc_3.3.4.bb @@ -1,2 +1,4 @@ +PR = "r3" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb index d6f35bb290..96662d5498 100644 --- a/packages/gcc/gcc_3.4.3.bb +++ b/packages/gcc/gcc_3.4.3.bb @@ -1,2 +1,4 @@ +PR = "r12" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index d6f35bb290..1a56a377f7 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -1,2 +1,4 @@ +PR = "r7" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index d6f35bb290..0a29996c09 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -1,2 +1,4 @@ +PR = "r3" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index d6f35bb290..1a56a377f7 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -1,2 +1,4 @@ +PR = "r7" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index d6f35bb290..0a29996c09 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -1,2 +1,4 @@ +PR = "r3" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index d6f35bb290..9f19110432 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,2 +1,4 @@ +PR = "r18" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index d6f35bb290..8e244b2cad 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,2 +1,4 @@ +PR = "r11" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index d6f35bb290..e3c91ac116 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,2 +1,4 @@ +PR = "r9" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index d6f35bb290..b553b20f72 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -1,2 +1,4 @@ +PR = "r6" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index d6f35bb290..0a29996c09 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -1,2 +1,4 @@ +PR = "r3" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb index d6f35bb290..2cccfb4d25 100644 --- a/packages/gcc/gcc_csl-arm-cvs.bb +++ b/packages/gcc/gcc_csl-arm-cvs.bb @@ -1,2 +1,4 @@ +PR = "r1" + require gcc-${PV}.inc require gcc-package-target.inc diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index d6f35bb290..2cccfb4d25 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -1,2 +1,4 @@ +PR = "r1" + require gcc-${PV}.inc require gcc-package-target.inc |