diff options
| author |   Tom Rini <tom_rini@mentor.com> | 2010-02-27 11:45:30 -0700 |
|---|---|---|
| committer | Tom Rini <tom_rini@mentor.com> | 2010-03-04 09:16:17 -0700 |
| commit | f38f68c348506605c32b7eaf69c194a802b3c80d (patch) | |
| tree | 79fc5358e7a551adad5ce494995fb615c5e68a47 | |
| parent | 43b7b697e8900a5367b52052262b268a52290540 (diff) | |
| download | openembedded-f38f68c348506605c32b7eaf69c194a802b3c80d.tar.gz | |
Pull mpfr/gmp builds into gcc builds
TODO: Apply mpfr/gmp patches in these builds, give the new libs that
gcc_svn / gcc-4.5 use the same treatment.
81 files changed, 180 insertions, 245 deletions
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 5aedb64ff5..dce11bb2b5 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -5,6 +5,8 @@ ############################################################################# # Base line versions, good for most things +PREFERRED_GMP_VERSION ?= "4.2.4" +PREFERRED_MPFR_VERSION ?= "2.3.2" PREFERRED_GCC_VERSION ?= "4.4.2" PREFERRED_BINUTILS ?= "2.20" diff --git a/recipes/gcc/gcc-3.3.3.inc b/recipes/gcc/gcc-3.3.3.inc index f0da44b3d8..3607c86281 100644 --- a/recipes/gcc/gcc-3.3.3.inc +++ b/recipes/gcc/gcc-3.3.3.inc @@ -1,7 +1,6 @@ require gcc-common.inc -SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://config.sub.patch;patch=1 \ +SRC_URI += "file://config.sub.patch;patch=1 \ file://empty6.patch;patch=1 \ file://pr10392-1-test.patch;patch=1 \ file://pr10412-1-test.patch;patch=1 \ diff --git a/recipes/gcc/gcc-3.3.4.inc b/recipes/gcc/gcc-3.3.4.inc index a3fbdded8f..cf64db36fc 100644 --- a/recipes/gcc/gcc-3.3.4.inc +++ b/recipes/gcc/gcc-3.3.4.inc @@ -1,9 +1,8 @@ require gcc-common.inc -INC_PR = "r11" +INC_PR = "r12" -SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://arm-gotoff.dpatch;patch=1;pnum=0 \ +SRC_URI += "file://arm-gotoff.dpatch;patch=1;pnum=0 \ file://arm-ldm.dpatch;patch=1;pnum=0 \ file://arm-tune.patch;patch=1;pnum=0 \ file://arm-ldm-peephole.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-3.4.3.inc b/recipes/gcc/gcc-3.4.3.inc index febe0fc67e..f870e02269 100644 --- a/recipes/gcc/gcc-3.4.3.inc +++ b/recipes/gcc/gcc-3.4.3.inc @@ -1,9 +1,8 @@ require gcc-common.inc -INC_PR = "r19" +INC_PR = "r20" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc34-reverse-compare.patch;patch=1 \ +SRC_URI += "file://gcc34-reverse-compare.patch;patch=1 \ file://gcc34-arm-ldm.patch;patch=1 \ file://gcc34-arm-ldm-peephole.patch;patch=1 \ file://gcc34-arm-tune.patch;patch=1 \ diff --git a/recipes/gcc/gcc-3.4.4.inc b/recipes/gcc/gcc-3.4.4.inc index b87e1e396b..afd47ba674 100644 --- a/recipes/gcc/gcc-3.4.4.inc +++ b/recipes/gcc/gcc-3.4.4.inc @@ -1,9 +1,8 @@ require gcc-common.inc -INC_PR = "r15" +INC_PR = "r16" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc34-reverse-compare.patch;patch=1 \ +SRC_URI += "file://gcc34-reverse-compare.patch;patch=1 \ file://gcc34-arm-ldm.patch;patch=1 \ file://gcc34-arm-ldm-peephole.patch;patch=1 \ file://gcc34-arm-tune.patch;patch=1 \ diff --git a/recipes/gcc/gcc-3.4.6.inc b/recipes/gcc/gcc-3.4.6.inc index faab40623e..b46c5ba5f1 100644 --- a/recipes/gcc/gcc-3.4.6.inc +++ b/recipes/gcc/gcc-3.4.6.inc @@ -1,7 +1,6 @@ require gcc-common.inc -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc34-reverse-compare.patch;patch=1 \ +SRC_URI += "file://gcc34-reverse-compare.patch;patch=1 \ file://gcc34-arm-ldm.patch;patch=1 \ file://gcc34-arm-ldm-peephole.patch;patch=1 \ file://gcc34-arm-tune.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.0.0.inc b/recipes/gcc/gcc-4.0.0.inc index fe56c3443b..f8878ec886 100644 --- a/recipes/gcc/gcc-4.0.0.inc +++ b/recipes/gcc/gcc-4.0.0.inc @@ -1,9 +1,8 @@ require gcc-common.inc -DEPENDS = "mpfr gmp" +DEPENDS = "" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc-posix-open-fix.patch;patch=1 \ +SRC_URI += "file://gcc-posix-open-fix.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/recipes/gcc/gcc-4.0.2.inc b/recipes/gcc/gcc-4.0.2.inc index a80e4010b3..083c01084f 100644 --- a/recipes/gcc/gcc-4.0.2.inc +++ b/recipes/gcc/gcc-4.0.2.inc @@ -1,9 +1,8 @@ require gcc-common.inc -DEPENDS = "mpfr gmp" +DEPENDS = "" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc-posix-open-fix.patch;patch=1 \ +SRC_URI += "file://gcc-posix-open-fix.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_4.1.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.1.0.inc b/recipes/gcc/gcc-4.1.0.inc index df0ae3f251..846899196f 100644 --- a/recipes/gcc/gcc-4.1.0.inc +++ b/recipes/gcc/gcc-4.1.0.inc @@ -7,8 +7,7 @@ DEFAULT_PREFERENCE = "-1" # Use the same patches as gcc-4.1.1 does FILESPATHPKG .= ":gcc-4.1.1" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://arm-nolibfloat.patch;patch=1 \ +SRC_URI += "file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ file://pr34130.patch;patch=1" diff --git a/recipes/gcc/gcc-4.1.1.inc b/recipes/gcc/gcc-4.1.1.inc index a960b415f2..0095b3d7a1 100644 --- a/recipes/gcc/gcc-4.1.1.inc +++ b/recipes/gcc/gcc-4.1.1.inc @@ -1,11 +1,10 @@ require gcc-common.inc -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r1" +INC_PR = "r2" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://110-arm-eabi.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://300-libstdc++-pic.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc index 21bf4869c2..38abd72bab 100644 --- a/recipes/gcc/gcc-4.1.2.inc +++ b/recipes/gcc/gcc-4.1.2.inc @@ -1,11 +1,10 @@ require gcc-common.inc -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r22" +INC_PR = "r23" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://110-arm-eabi.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://300-libstdc++-pic.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.1.inc b/recipes/gcc/gcc-4.2.1.inc index c4e2c3a0c6..3cba5ba236 100644 --- a/recipes/gcc/gcc-4.2.1.inc +++ b/recipes/gcc/gcc-4.2.1.inc @@ -1,9 +1,8 @@ require gcc-common.inc -DEPENDS = "mpfr gmp" +DEPENDS = "" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://203-uclibc-locale-no__x.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.2.inc b/recipes/gcc/gcc-4.2.2.inc index 931de9a650..0110c6cde9 100644 --- a/recipes/gcc/gcc-4.2.2.inc +++ b/recipes/gcc/gcc-4.2.2.inc @@ -1,12 +1,11 @@ require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r16" +INC_PR = "r17" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://203-uclibc-locale-no__x.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.3.inc b/recipes/gcc/gcc-4.2.3.inc index b2fb0292bb..ae52f82b0b 100644 --- a/recipes/gcc/gcc-4.2.3.inc +++ b/recipes/gcc/gcc-4.2.3.inc @@ -1,12 +1,11 @@ require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" INC_PR = "r17" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://203-uclibc-locale-no__x.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index e96122a2b2..0a6d410c33 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -1,12 +1,11 @@ require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r10" +INC_PR = "r11" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ +SRC_URI += "file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ file://200-uclibc-locale.patch;patch=1 \ file://203-uclibc-locale-no__x.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.3.1.inc b/recipes/gcc/gcc-4.3.1.inc index 3eaff45599..b837526f1b 100644 --- a/recipes/gcc/gcc-4.3.1.inc +++ b/recipes/gcc/gcc-4.3.1.inc @@ -5,12 +5,11 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r20" +INC_PR = "r21" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ +SRC_URI += "file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.2.inc b/recipes/gcc/gcc-4.3.2.inc index 8d40d72795..d0ad53e748 100644 --- a/recipes/gcc/gcc-4.3.2.inc +++ b/recipes/gcc/gcc-4.3.2.inc @@ -5,12 +5,11 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r10" +INC_PR = "r11" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ +SRC_URI += "file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc index 47bfbc6a24..759f81eab3 100644 --- a/recipes/gcc/gcc-4.3.3.inc +++ b/recipes/gcc/gcc-4.3.3.inc @@ -5,12 +5,11 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r11" +INC_PR = "r12" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ +SRC_URI += "file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.3.4.inc b/recipes/gcc/gcc-4.3.4.inc index ff02ac5e47..cdac25e58d 100644 --- a/recipes/gcc/gcc-4.3.4.inc +++ b/recipes/gcc/gcc-4.3.4.inc @@ -5,12 +5,11 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r8" +INC_PR = "r9" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ +SRC_URI += "file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \ file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \ file://fedora/gcc43-java-nomulti.patch;patch=1;pnum=0 \ file://fedora/gcc43-ppc32-retaddr.patch;patch=1;pnum=0 \ diff --git a/recipes/gcc/gcc-4.4.1.inc b/recipes/gcc/gcc-4.4.1.inc index cbf28ddc62..300e21e769 100644 --- a/recipes/gcc/gcc-4.4.1.inc +++ b/recipes/gcc/gcc-4.4.1.inc @@ -5,14 +5,13 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r8" +INC_PR = "r9" FILESPATHPKG .= ":gcc-$PV" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ +SRC_URI += "file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://100-uclibc-conf.patch;patch=1 \ file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \ file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \ @@ -25,6 +24,9 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-pr41175.patch;patch=1 \ file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \ " +SRC_URI[gcctbz2.md5sum] = "927eaac3d44b22f31f9c83df82f26436" +SRC_URI[gcctbz2.sha256sum] = "cbefa9abd4adac0931e1b556072dcd8b32a360d4b95a94d7822c86bded803d5b" + # Language Overrides FORTRAN = "" JAVA = "" diff --git a/recipes/gcc/gcc-4.4.2.inc b/recipes/gcc/gcc-4.4.2.inc index 4b11f310c4..036f0d8fc2 100644 --- a/recipes/gcc/gcc-4.4.2.inc +++ b/recipes/gcc/gcc-4.4.2.inc @@ -5,14 +5,13 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r2" +INC_PR = "r3" FILESPATHPKG .= ":gcc-$PV" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ - file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ +SRC_URI += "file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://100-uclibc-conf.patch;patch=1 \ file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \ file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \ diff --git a/recipes/gcc/gcc-4.4.3.inc b/recipes/gcc/gcc-4.4.3.inc index 25098d523b..747657393b 100644 --- a/recipes/gcc/gcc-4.4.3.inc +++ b/recipes/gcc/gcc-4.4.3.inc @@ -5,14 +5,13 @@ ARM_INSTRUCTION_SET = "arm" require gcc-common.inc LICENSE = "GPLv3" -DEPENDS = "mpfr gmp" +DEPENDS = "" -INC_PR = "r0" +INC_PR = "r1" FILESPATHPKG .= ":gcc-$PV" -SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc443tarbz2 \ - file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ +SRC_URI += "file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ file://100-uclibc-conf.patch;patch=1 \ file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \ file://gcc-disable-linux-unwind-with-libc-inhibit.patch;patch=1 \ @@ -25,8 +24,8 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcc443tarbz2 \ file://gcc-pr41175.patch;patch=1 \ file://gcc-armv4-pass-fix-v4bx-to-ld.patch;patch=1 \ " -SRC_URI[gcc443tarbz2.md5sum] = "fe1ca818fc6d2caeffc9051fe67ff103" -SRC_URI[gcc443tarbz2.sha256sum] = "97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040" +SRC_URI[gcctbz2.md5sum] = "fe1ca818fc6d2caeffc9051fe67ff103" +SRC_URI[gcctbz2.sha256sum] = "97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040" # Language Overrides FORTRAN = "" diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb index dadb5b04f6..dbcca3b445 100644 --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb @@ -1,6 +1,6 @@ inherit canadian-sdk -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -8,9 +8,6 @@ PACKAGES = "${PN}" require gcc-${PV}.inc -# Correct gmp / mpfr -DEPENDS = "gmp-canadian mpfr-canadian" - require gcc-configure-canadian-sdk.inc require gcc-package-sdk.inc @@ -22,5 +19,4 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \ " EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_LIBDIR}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-common.inc b/recipes/gcc/gcc-common.inc index 97b140cb0f..cab45fae3d 100644 --- a/recipes/gcc/gcc-common.inc +++ b/recipes/gcc/gcc-common.inc @@ -3,6 +3,14 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" +# In case sane-toolchain.inc is not used. +PREFERRED_GMP_VERSION ?= "4.2.4" +PREFERRED_MPFR_VERSION ?= "2.3.2" + +SRC_URI = "${GNU_MIRROR}/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2;name=gcctbz2 \ + ${GNU_MIRROR}/gmp/gmp-${PREFERRED_GMP_VERSION}.tar.bz2 \ + http://www.mpfr.org/mpfr-${PREFERRED_MPFR_VERSION}/mpfr-${PREFERRED_MPFR_VERSION}.tar.bz2" + inherit autotools gettext FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -41,3 +49,10 @@ BINV = "${PV}" S = "${WORKDIR}/gcc-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" +do_unpack2() { + cd ${WORKDIR} + mv gmp-${PREFERRED_GMP_VERSION} gcc-${PV}/gmp + mv mpfr-${PREFERRED_MPFR_VERSION} gcc-${PV}/mpfr +} + +addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-cross-initial_4.0.0.bb b/recipes/gcc/gcc-cross-initial_4.0.0.bb index 976cd96b00..ffe5fe37eb 100644 --- a/recipes/gcc/gcc-cross-initial_4.0.0.bb +++ b/recipes/gcc/gcc-cross-initial_4.0.0.bb @@ -1,6 +1,4 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-multilib --disable-libssp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-initial_4.3.1.bb b/recipes/gcc/gcc-cross-initial_4.3.1.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.1.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.3.2.bb b/recipes/gcc/gcc-cross-initial_4.3.2.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.2.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.3.3.bb b/recipes/gcc/gcc-cross-initial_4.3.3.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.3.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.3.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.3.4.bb b/recipes/gcc/gcc-cross-initial_4.3.4.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.3.4.bb +++ b/recipes/gcc/gcc-cross-initial_4.3.4.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.4.1.bb b/recipes/gcc/gcc-cross-initial_4.4.1.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.1.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.1.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.4.2.bb b/recipes/gcc/gcc-cross-initial_4.4.2.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.2.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.2.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_4.4.3.bb b/recipes/gcc/gcc-cross-initial_4.4.3.bb index 067ab61be3..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_4.4.3.bb +++ b/recipes/gcc/gcc-cross-initial_4.4.3.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-initial_svn.bb b/recipes/gcc/gcc-cross-initial_svn.bb index 8356dd1fac..8ee2e6eec8 100644 --- a/recipes/gcc/gcc-cross-initial_svn.bb +++ b/recipes/gcc/gcc-cross-initial_svn.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -DEPENDS += "gmp-native mpfr-native libmpc-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --enable-decimal-float=no \ diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb index a9ae5bdf20..a909fa72fd 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.1.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb index a9ae5bdf20..a909fa72fd 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.2.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb index a9ae5bdf20..a909fa72fd 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.3.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.3.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb index a9ae5bdf20..a909fa72fd 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.3.4.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.3.4.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp" diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb index 3ca59aa02f..51c12aef4f 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.1.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.1.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp \ diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb index 3ca59aa02f..51c12aef4f 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.2.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.2.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp \ diff --git a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb index 3ca59aa02f..51c12aef4f 100644 --- a/recipes/gcc/gcc-cross-intermediate_4.4.3.bb +++ b/recipes/gcc/gcc-cross-intermediate_4.4.3.bb @@ -1,8 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ --disable-libssp \ diff --git a/recipes/gcc/gcc-cross-intermediate_svn.bb b/recipes/gcc/gcc-cross-intermediate_svn.bb index b816c8b81c..923c16d70a 100644 --- a/recipes/gcc/gcc-cross-intermediate_svn.bb +++ b/recipes/gcc/gcc-cross-intermediate_svn.bb @@ -1,7 +1,7 @@ require gcc-cross_${PV}.bb require gcc-cross-intermediate.inc -DEPENDS += "libmpc-native gmp-native mpfr-native" +DEPENDS += "libmpc-native" EXTRA_OECONF += " --disable-libmudflap \ --disable-libgomp \ diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb index f133db31b1..fcc21e78d3 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,8 +1,6 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc - -DEPENDS += "gmp-native mpfr-native" diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb index f133db31b1..fcc21e78d3 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,8 +1,6 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc - -DEPENDS += "gmp-native mpfr-native" diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 6a7460664f..6bd78ec54a 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,10 +1,8 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index bea9839246..39e6a0d3b0 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index bea9839246..39e6a0d3b0 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 9c67c7e119..d79331cf78 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \ - --enable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --enable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index bea9839246..39e6a0d3b0 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index bea9839246..39e6a0d3b0 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index ed39d3176d..87981d1ea9 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index 88e26c509b..aa8a09cbfe 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" inherit sdk @@ -7,8 +7,5 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index e1b510e58f..7789d002e5 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -4,10 +4,7 @@ require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "${INC_PR}.1" - -DEPENDS += "gmp-native mpfr-native" +PR = "${INC_PR}.2" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index e1b510e58f..7789d002e5 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -4,10 +4,7 @@ require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "${INC_PR}.1" - -DEPENDS += "gmp-native mpfr-native" +PR = "${INC_PR}.2" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.3.bb b/recipes/gcc/gcc-cross-sdk_4.4.3.bb index e1b510e58f..7789d002e5 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.3.bb @@ -4,10 +4,7 @@ require gcc-${PV}.inc require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "${INC_PR}.1" - -DEPENDS += "gmp-native mpfr-native" +PR = "${INC_PR}.2" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 2e4fcf25a6..a15accaf81 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" inherit sdk @@ -13,7 +13,6 @@ EXTRA_OECONF += " \ --disable-libgomp \ --disable-libunwind-exceptions \ --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ " #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 48d8a0d1ed..0ae3dcb6fd 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk @@ -7,8 +7,7 @@ require gcc-cross-sdk.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -DEPENDS += "libmpc-native gmp-native mpfr-native" +DEPENDS += "libmpc-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ - --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --disable-libgomp --disable-libmudflap" diff --git a/recipes/gcc/gcc-cross4.inc b/recipes/gcc/gcc-cross4.inc index 77a55968fa..51d0529342 100644 --- a/recipes/gcc/gcc-cross4.inc +++ b/recipes/gcc/gcc-cross4.inc @@ -1,5 +1,3 @@ require gcc-cross.inc -DEPENDS += "gmp-native mpfr-native" - EXTRA_OECONF_append_sh4 = " --with-multilib-list=m4,m4-nofpu " diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index def05869d8..017a9e961b 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -1,8 +1,8 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index e96867e682..9e0d316518 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,4 +7,4 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 2367d196c9..5834f833df 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " EXTRA_OECONF_append_avr32= " --disable-libmudflap " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index 8c7f4c50ed..8b50dfd8d4 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r21" +PR = "r22" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index cf1bf6837f..ac1d6c7c87 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index cf1bf6837f..ac1d6c7c87 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index cf1bf6837f..ac1d6c7c87 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index acd552101a..6007b40c98 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 94b98b9e63..e85348c6e6 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index 94b98b9e63..e85348c6e6 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb index 71cb5e63f6..e85348c6e6 100644 --- a/recipes/gcc/gcc-cross_4.3.4.bb +++ b/recipes/gcc/gcc-cross_4.3.4.bb @@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.2" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb index 11eb29d419..15cbb7c194 100644 --- a/recipes/gcc/gcc-cross_4.4.1.bb +++ b/recipes/gcc/gcc-cross_4.4.1.bb @@ -2,10 +2,10 @@ require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb index 11eb29d419..15cbb7c194 100644 --- a/recipes/gcc/gcc-cross_4.4.2.bb +++ b/recipes/gcc/gcc-cross_4.4.2.bb @@ -2,10 +2,10 @@ require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.3.bb b/recipes/gcc/gcc-cross_4.4.3.bb index 11eb29d419..15cbb7c194 100644 --- a/recipes/gcc/gcc-cross_4.4.3.bb +++ b/recipes/gcc/gcc-cross_4.4.3.bb @@ -2,10 +2,10 @@ require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --disable-libunwind-exceptions" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index 34bd251a12..5d796bf42b 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-csl-arm-2007q3.inc require gcc-cross4.inc @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index d534574c2e..55e1fd3660 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-csl-arm-2008q1.inc require gcc-cross4.inc @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb index ef4ef304ef..e6065cce78 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-csl-arm-2008q3.inc require gcc-cross4.inc @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index 2d3c1368dc..99977abb82 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc @@ -8,6 +8,6 @@ DEPENDS += "libmpc-native" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-system-zlib" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-csl-arm-2005q3.inc b/recipes/gcc/gcc-csl-arm-2005q3.inc index 55bbe4b13a..d81c3a7857 100644 --- a/recipes/gcc/gcc-csl-arm-2005q3.inc +++ b/recipes/gcc/gcc-csl-arm-2005q3.inc @@ -1,12 +1,13 @@ require gcc-common.inc BINV = "3.4.4" -PV = "3.4.4+csl-arm-2005q3" +CSV = "2005q3-2" +PV = "3.4.4+csl-arm-${CSV}" PV_chinook-compat = "3.4.4cs2005q3.2" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \ +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-${CSV}-arm-none-eabi.src.tar.bz2 \ file://gcc_optab_arm.patch;patch=1 \ file://gcc-3.4.4-eabi-bigendian.patch;patch=1 \ file://libstdc++_configure.patch;patch=1 \ @@ -17,9 +18,9 @@ S = "${WORKDIR}/gcc-2005q3" do_unpack2() { cd ${WORKDIR} - tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gcc-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/mpfr-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gmp-${CSV}.tar.bz2 + mv mpfr-mirror ${S}/mpfr + mv gmp-mirror ${S}/gmp } - -addtask unpack2 after do_unpack before do_patch - - diff --git a/recipes/gcc/gcc-csl-arm-2006q1.inc b/recipes/gcc/gcc-csl-arm-2006q1.inc index a208170b47..30f1d6f9ba 100644 --- a/recipes/gcc/gcc-csl-arm-2006q1.inc +++ b/recipes/gcc/gcc-csl-arm-2006q1.inc @@ -1,11 +1,12 @@ require gcc-common.inc BINV = "4.1.0" -PV = "4.1.0+csl-arm-2006q1-6" +CSV = "2006q1-6" +PV = "4.1.0+csl-arm-${CSV}" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2006q1-6-arm-none-eabi.src.tar.bz2 \ +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-${CSV}-arm-none-eabi.src.tar.bz2 \ file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \ file://gcc-new-makeinfo.patch;patch=1" @@ -13,7 +14,9 @@ S = "${WORKDIR}/gcc-2006q1" do_unpack2() { cd ${WORKDIR} - tar -xvjf ./arm-2006q1-6-arm-none-eabi/gcc-2006q1-6.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gcc-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/mpfr-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gmp-${CSV}.tar.bz2 + mv mpfr-mirror ${S}/mpfr + mv gmp-mirror ${S}/gmp } - -addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-csl-arm-2007q3.inc b/recipes/gcc/gcc-csl-arm-2007q3.inc index a3da6c9ca3..a4f9dc2352 100644 --- a/recipes/gcc/gcc-csl-arm-2007q3.inc +++ b/recipes/gcc/gcc-csl-arm-2007q3.inc @@ -1,11 +1,12 @@ require gcc-common.inc BINV = "4.2.1" -PV = "4.2.1+csl-arm-2007q3-53" +CSV = "2007q3-53" +PV = "4.2.1+csl-arm-${CSV}" FILESPATH = "${FILE_DIRNAME}/gcc-csl-arm-2007q3:${FILE_DIRNAME}/gcc-csl-arm" -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2007q3-53-arm-none-eabi.src.tar.bz2 \ +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-${CSV}-arm-none-eabi.src.tar.bz2 \ file://gcc-new-makeinfo.patch;patch=1 \ # file://100-uclibc-conf.patch;patch=1 \ # file://103-uclibc-conf-noupstream.patch;patch=1 \ @@ -38,7 +39,11 @@ S = "${WORKDIR}/gcc-4.2" do_unpack2() { cd ${WORKDIR} - tar -xvjf ./arm-2007q3-53-arm-none-eabi/gcc-2007q3-53.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gcc-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/mpfr-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gmp-${CSV}.tar.bz2 + mv mpfr-mirror ${S}/mpfr + mv gmp-mirror ${S}/gmp } # Language Overrides @@ -48,5 +53,3 @@ FORTRAN = "" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" - -addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-csl-arm-2008q1.inc b/recipes/gcc/gcc-csl-arm-2008q1.inc index 8c2a1c5003..38cc5d350d 100644 --- a/recipes/gcc/gcc-csl-arm-2008q1.inc +++ b/recipes/gcc/gcc-csl-arm-2008q1.inc @@ -1,11 +1,12 @@ require gcc-common.inc BINV = "4.2.3" -PV = "4.2.3+csl-arm-2008q1-126" +CSV = "2008q1-126" +PV = "4.2.3+csl-arm-${CSV}" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \ +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-${CSV}-arm-none-eabi.src.tar.bz2 \ # file://100-uclibc-conf.patch;patch=1 \ # file://103-uclibc-conf-noupstream.patch;patch=1 \ # file://200-uclibc-locale.patch;patch=1 \ @@ -36,7 +37,11 @@ S = "${WORKDIR}/gcc-4.2" do_unpack2() { cd ${WORKDIR} - tar -xvjf ./arm-2008q1-126-arm-none-eabi/gcc-2008q1-126.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gcc-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/mpfr-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gmp-${CSV}.tar.bz2 + mv mpfr-mirror ${S}/mpfr + mv gmp-mirror ${S}/gmp } # Language Overrides @@ -46,5 +51,3 @@ FORTRAN = "" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" - -addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-csl-arm-2008q3.inc b/recipes/gcc/gcc-csl-arm-2008q3.inc index 13b61b6f0e..3005d88c9f 100644 --- a/recipes/gcc/gcc-csl-arm-2008q3.inc +++ b/recipes/gcc/gcc-csl-arm-2008q3.inc @@ -1,11 +1,12 @@ require gcc-common.inc BINV = "4.3.2" -PV = "4.3.2+csl-arm-2008q3-39" +CSV = "2008q3-39" +PV = "4.3.2+csl-arm-${CSV}" FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm-2008q3" -SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q3-39-arm-none-eabi.src.tar.bz2 \ +SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-${CSV}-arm-none-eabi.src.tar.bz2 \ file://gcc-csl-2008q3-hotfix.diff;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ @@ -20,7 +21,11 @@ S = "${WORKDIR}/gcc-4.3" do_unpack2() { cd ${WORKDIR} - tar -xvjf ./arm-2008q3-39-arm-none-eabi/gcc-2008q3-39.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gcc-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/mpfr-${CSV}.tar.bz2 + tar -xvjf ./arm-${CSV}-arm-none-eabi/gmp-${CSV}.tar.bz2 + mv mpfr-mirror ${S}/mpfr + mv gmp-mirror ${S}/gmp } # Language Overrides @@ -30,5 +35,3 @@ FORTRAN_linux-gnueabi = ",fortran" EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" - -addtask unpack2 after do_unpack before do_patch diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index 6583378233..9af664ef7f 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -5,7 +5,7 @@ SRCREV = "156268" require gcc-common.inc -DEPENDS = "mpfr gmp libmpc" +DEPENDS = "libmpc" BINV = "4.5.0" PV = "4.5+svnr${SRCPV}" @@ -39,4 +39,3 @@ EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float " EXTRA_OECONF_append_linux-uclibc = " ${@base_contains('TARGET_ARCH', 'powerpc', '--without-long-double-128', '',d)}" - |