From a48bd637aa3b73f0da3bdcbef32606b34820ed81 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 12 Aug 2007 08:19:40 +0000 Subject: avr32-gcc, avr32-gcc-cross: add 4.1.2 --- packages/gcc/avr32-gcc-cross_4.1.2.bb | 22 ++++++++++++++++++++++ packages/gcc/avr32-gcc_4.1.2.bb | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 packages/gcc/avr32-gcc-cross_4.1.2.bb create mode 100644 packages/gcc/avr32-gcc_4.1.2.bb (limited to 'packages/gcc') diff --git a/packages/gcc/avr32-gcc-cross_4.1.2.bb b/packages/gcc/avr32-gcc-cross_4.1.2.bb new file mode 100644 index 0000000000..e34098f840 --- /dev/null +++ b/packages/gcc/avr32-gcc-cross_4.1.2.bb @@ -0,0 +1,22 @@ +require avr32-gcc_${PV}.bb +# path mangling, needed by the cross packaging +require gcc-paths-cross.inc +inherit cross +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 = "r0" + +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" +PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" + +# 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 " + +EXTRA_OECONF += " --disable-libmudflap \ + --disable-libunwind-exceptions \ + --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/avr32-gcc_4.1.2.bb b/packages/gcc/avr32-gcc_4.1.2.bb new file mode 100644 index 0000000000..60254db87e --- /dev/null +++ b/packages/gcc/avr32-gcc_4.1.2.bb @@ -0,0 +1,22 @@ +require gcc_${PV}.bb + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.1.2', '${FILE_DIRNAME}/gcc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.0.0.tar.gz \ +# file://100-uclibc-conf.patch;patch=1 \ +# file://200-uclibc-locale.patch;patch=1 \ +# file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ + file://cache-amnesia.patch;patch=1 \ + " + +do_compile_prepend() { +ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux +} -- cgit v1.2.3 From 6e6f3fc99a12d6b8a120b5981cacb57f3c87db39 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 13 Sep 2007 13:50:43 +0000 Subject: gcc-package-cross.inc: avr32 gcc doesn't create lib*.so, so don't error out on missing files * bad fix, the check needs fixing --- packages/gcc/gcc-package-cross.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index a7a4908120..5f77642fe5 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -47,12 +47,12 @@ do_install () { elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} else - mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr mkdir -p ${D}${target_libdir} - mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} + mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true if [ "${HAS_G2C}" = "yes" ]; then mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true fi -- cgit v1.2.3 From 5c5a3a267b01ee1dec04d79c3408cff29e1662a3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 14 Sep 2007 09:17:57 +0000 Subject: avr32 gcc: update to atmel 1.1.0 release --- packages/gcc/avr32-gcc-cross_4.1.2.bb | 2 +- packages/gcc/avr32-gcc_4.1.2.bb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/avr32-gcc-cross_4.1.2.bb b/packages/gcc/avr32-gcc-cross_4.1.2.bb index e34098f840..765619ad69 100644 --- a/packages/gcc/avr32-gcc-cross_4.1.2.bb +++ b/packages/gcc/avr32-gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross 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 = "r0" +PR = "r1" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/avr32-gcc_4.1.2.bb b/packages/gcc/avr32-gcc_4.1.2.bb index 60254db87e..fd461728bd 100644 --- a/packages/gcc/avr32-gcc_4.1.2.bb +++ b/packages/gcc/avr32-gcc_4.1.2.bb @@ -1,8 +1,10 @@ require gcc_${PV}.bb +PR = "r1" + FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.1.2', '${FILE_DIRNAME}/gcc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.0.0.tar.gz \ +SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \ # file://100-uclibc-conf.patch;patch=1 \ # file://200-uclibc-locale.patch;patch=1 \ # file://300-libstdc++-pic.patch;patch=1 \ -- cgit v1.2.3 From d40abc25e7e7c7a64709828055322321cbebc3e9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 30 Sep 2007 09:28:24 +0000 Subject: gcc-package-cross: fix for avr32-gcc and cross-linkage changes --- packages/gcc/gcc-package-cross.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index a251fe4bfa..036bbf7b00 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -44,14 +44,14 @@ do_install () { # Already in the right location : elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then - mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} + mv -f ${D}${prefix}/lib/libgcc_s.so* ${D}${target_base_libdir} || true else mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true fi # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr mkdir -p ${D}${target_libdir} - mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} + mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true @@ -60,7 +60,7 @@ do_install () { if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.* ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true - ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* + ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* || true ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true fi } -- cgit v1.2.3 From 1466348a03b6af7034ca91618a74a33e5665540b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 20 Oct 2007 15:48:00 +0000 Subject: gcc: merge avr32 bits into proper gcc files --- packages/gcc/gcc-cross_4.1.2.bb | 4 +++- packages/gcc/gcc_4.1.2.bb | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 3272876326..0a44a671ee 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross 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 = "r9" +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++" @@ -17,4 +17,6 @@ require gcc-package-cross.inc 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}/${BUILD_SYS}" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 5d01163d94..8c6dc524df 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -35,6 +35,25 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " +SRC_URI_avr32 = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \ +# file://100-uclibc-conf.patch;patch=1 \ +# file://200-uclibc-locale.patch;patch=1 \ +# file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ + file://cache-amnesia.patch;patch=1 \ + " + +do_compile_prepend_avr32() { + ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux +} + #Set the fortran bits # ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" -- cgit v1.2.3 From 84b2b31930881004a73267cf24fe6fe701e0f8a8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Oct 2007 15:10:40 +0000 Subject: gcc-package-cross.inc: re-add avr32 safeguards lost in merge --- packages/gcc/gcc-package-cross.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 3dcf86c686..cbd01c3e39 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -48,7 +48,7 @@ do_install () { elif [ -f ${D}${prefix}/*/lib/nof/libgcc_s.so.? ]; then mv -f ${D}${prefix}/*/lib/nof/libgcc_s.so* ${D}${target_base_libdir} else - mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} + mv -f ${D}${prefix}/*/lib/libgcc_s.so* ${D}${target_base_libdir} || true fi @@ -58,12 +58,12 @@ do_install () { if [ -f ${D}${prefix}/*/lib/nof/libstdc++.so ]; then - mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} + mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true else - mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} + mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true fi -- cgit v1.2.3 From 3b0d162d85977a2ae198e0cc6060b051408375ed Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Oct 2007 18:46:24 +0000 Subject: gcc: move avr32 stuff into gcc recipe and update to 4.2.1 --- packages/gcc/avr32-gcc-cross_4.1.2.bb | 22 ---------------------- packages/gcc/avr32-gcc_4.1.2.bb | 24 ------------------------ packages/gcc/gcc_4.2.1.bb | 30 ++++++++++++++++++++++++++++-- 3 files changed, 28 insertions(+), 48 deletions(-) delete mode 100644 packages/gcc/avr32-gcc-cross_4.1.2.bb delete mode 100644 packages/gcc/avr32-gcc_4.1.2.bb (limited to 'packages/gcc') diff --git a/packages/gcc/avr32-gcc-cross_4.1.2.bb b/packages/gcc/avr32-gcc-cross_4.1.2.bb deleted file mode 100644 index 765619ad69..0000000000 --- a/packages/gcc/avr32-gcc-cross_4.1.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -require avr32-gcc_${PV}.bb -# path mangling, needed by the cross packaging -require gcc-paths-cross.inc -inherit cross -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 = "r1" - -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" -PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" - -# 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 " - -EXTRA_OECONF += " --disable-libmudflap \ - --disable-libunwind-exceptions \ - --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/avr32-gcc_4.1.2.bb b/packages/gcc/avr32-gcc_4.1.2.bb deleted file mode 100644 index fd461728bd..0000000000 --- a/packages/gcc/avr32-gcc_4.1.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -require gcc_${PV}.bb - -PR = "r1" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.1.2', '${FILE_DIRNAME}/gcc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/gcc-4.1.2-atmel.1.1.0.tar.gz \ -# file://100-uclibc-conf.patch;patch=1 \ -# file://200-uclibc-locale.patch;patch=1 \ -# file://300-libstdc++-pic.patch;patch=1 \ - file://301-missing-execinfo_h.patch;patch=1 \ - file://302-c99-snprintf.patch;patch=1 \ - file://303-c99-complex-ugly-hack.patch;patch=1 \ - file://304-index_macro.patch;patch=1 \ - file://602-sdk-libstdc++-includes.patch;patch=1 \ - file://gcc41-configure.in.patch;patch=1 \ - file://ldflags.patch;patch=1 \ - file://zecke-xgcc-cpp.patch;patch=1 \ - file://cache-amnesia.patch;patch=1 \ - " - -do_compile_prepend() { -ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux -} diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index 7bf074de57..af90755c3b 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -41,6 +41,32 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gfortran.patch;patch=1 \ " +SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \ + 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 \ + file://204-uclibc-locale-wchar_fix.patch;patch=1 \ + file://205-uclibc-locale-update.patch;patch=1 \ + file://300-libstdc++-pic.patch;patch=1 \ + file://301-missing-execinfo_h.patch;patch=1 \ + file://302-c99-snprintf.patch;patch=1 \ + file://303-c99-complex-ugly-hack.patch;patch=1 \ + file://304-index_macro.patch;patch=1 \ + file://305-libmudflap-susv3-legacy.patch;patch=1 \ + file://306-libstdc++-namespace.patch;patch=1 \ + file://307-locale_facets.patch;patch=1 \ + file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://740-sh-pr24836.patch;patch=1 \ + file://904-flatten-switch-stmt-00.patch;patch=1 \ + file://gcc41-configure.in.patch;patch=1 \ + file://ldflags.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ + file://cache-amnesia.patch;patch=1 \ + file://gfortran.patch;patch=1 \ +" + SRC_URI_append_ep93xx = " \ file://arm-crunch-saveregs.patch;patch=1 \ file://arm-crunch-20000320.patch;patch=1 \ @@ -79,5 +105,5 @@ require gcc3-build.inc ARCH_FLAGS_FOR_TARGET=-isystem${STAGING_INCDIR} -EXTRA_OECONF += " --disable-libssp --disable-bootstrap " +EXTRA_OECONF += " --disable-libgomp --disable-libssp --disable-bootstrap " -- cgit v1.2.3 From 6b89ac130f52fbc8da821ac96d4ccdd3f0d0daa1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Nov 2007 14:35:36 +0000 Subject: gcc 4.2.1: merge with .dev --- packages/gcc/gcc-cross-initial_4.2.1.bb | 3 ++- packages/gcc/gcc-cross_4.2.1.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-cross-initial_4.2.1.bb b/packages/gcc/gcc-cross-initial_4.2.1.bb index 1c1d094382..0f8813cc70 100644 --- a/packages/gcc/gcc-cross-initial_4.2.1.bb +++ b/packages/gcc/gcc-cross-initial_4.2.1.bb @@ -1,5 +1,6 @@ require gcc-cross_${PV}.bb require gcc-cross-initial.inc -EXTRA_OECONF += "--disable-libmudflap \ +EXTRA_OECONF += " --disable-libgomp \ + --disable-libmudflap \ --disable-libssp" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index da27c68d9a..8204e2c316 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -5,7 +5,7 @@ inherit cross 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 = "r9" +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++" -- cgit v1.2.3