Date: Friday, March 29, 2013 @ 23:23:25 Author: heftig Revision: 87326
gcc 4.8 update Modified: gcc-multilib/trunk/PKGBUILD Deleted: gcc-multilib/trunk/gcc-4.7.1-libgo-write.patch -----------------------------+ PKGBUILD | 141 +++++++++++++++++++++--------------------- gcc-4.7.1-libgo-write.patch | 13 --- 2 files changed, 71 insertions(+), 83 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-03-29 22:06:27 UTC (rev 87325) +++ PKGBUILD 2013-03-29 22:23:25 UTC (rev 87326) @@ -5,47 +5,38 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version -pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.7.2 -pkgrel=4 +pkgver=4.8.0 +pkgrel=1 #_snapshot=4.7-20120721 pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'doxygen' +makedepends=('binutils-multilib>=2.23' 'libmpc' 'cloog' 'gcc-ada-multilib' 'doxygen' 'lib32-glibc>=2.17') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - gcc-4.7.1-libgo-write.patch) -md5sums=('cc308a0891e778cfda7a151ab8a6e762' - 'df82dd175ac566c8a6d46b11ac21f14c') +md5sums=('e6040024eb9e761c3bea348d1fa5abb0') if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" + _basedir=gcc-${_snapshot} else - _basedir="${srcdir}/gcc-${pkgver}" + _basedir=gcc-${pkgver} fi build() { - cd ${_basedir} + cd ${srcdir}/${_basedir} - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in # Arch Linux installs x86_64 libraries /lib [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 - patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch - echo ${pkgver} > gcc/BASE-VER # using -pipe causes spurious test-suite failures @@ -56,7 +47,7 @@ cd ${srcdir} mkdir gcc-build && cd gcc-build - ${_basedir}/configure --prefix=/usr \ + ${srcdir}/${_basedir}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --mandir=/usr/share/man --infodir=/usr/share/info \ --with-bugurl=https://bugs.archlinux.org/ \ @@ -64,15 +55,13 @@ --enable-shared --enable-threads=posix \ --with-system-zlib --enable-__cxa_atexit \ --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ + --disable-libstdcxx-pch \ --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --disable-ppl-version-check --disable-cloog-version-check \ + --enable-cloog-backend=isl --disable-cloog-version-check \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --enable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ + --with-linker-hash-style=gnu --disable-install-libiberty \ + --enable-multilib --disable-libssp --disable-werror \ --enable-checking=release make @@ -90,7 +79,7 @@ # do not abort on error as some are "expected" make -k check || true - ${_basedir}/contrib/test_summary + ${srcdir}/${_basedir}/contrib/test_summary } package_gcc-libs-multilib() @@ -103,9 +92,13 @@ cd ${srcdir}/gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do + for lib in libmudflap libgomp libstdc++-v3/src libitm libsanitizer/asan; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done + + [[ $CARCH == "x86_64" ]] && \ + make -j1 -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info @@ -124,44 +117,14 @@ find ${pkgdir} -name *.a -delete # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION } -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.17' "gcc-libs>=$pkgver") - - cd ${srcdir}/gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - package_gcc-multilib() { pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.23' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.23' 'libmpc' 'cloog') groups=('multilib-devel') provides=("gcc=$pkgver-$pkgrel") conflicts=('gcc') @@ -172,19 +135,20 @@ make -j1 DESTDIR=${pkgdir} install install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py + mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py # unfortunately it is much, much easier to install the lot and clean-up the mess... rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc}.a + rm $pkgdir/usr/lib{,32}/lib{atomic,ffi,gfortran,go{,begin},objc}.a + rm $pkgdir/usr/lib/libiberty.a rm $pkgdir/usr/lib{,32}/libgfortran.spec rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libffi,libgomp,libquadmath,libitm}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 rm $pkgdir/usr/share/man/man3/ffi* @@ -227,7 +191,7 @@ ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3 # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION } @@ -247,10 +211,15 @@ ln -s gfortran ${pkgdir}/usr/bin/f95 - rm ${pkgdir}/usr/lib{,32}/libgfortran.so* + # remove files included in gcc-libs or gcc + rm ${pkgdir}/usr/lib{,32}/lib{gfortran,gcc_s}.so* + rm ${pkgdir}/usr/lib{,32}/libquadmath.{a,so*} + rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{*.o,libgc*} + rm ${pkgdir}/usr/share/info/libquadmath.info + rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION } @@ -266,11 +235,13 @@ install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* + # remove files included in gcc-libs or gcc + rm ${pkgdir}/usr/lib{,32}/lib{gcc_s,objc}.so* + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{*.o,lib*} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/unwind.h # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION } @@ -293,7 +264,7 @@ ln -s gcc ${pkgdir}/usr/bin/gnatgcc # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION } @@ -311,6 +282,36 @@ install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go-multilib/RUNTIME.LIBRARY.EXCEPTION } + +package_lib32-gcc-libs() +{ + pkgdesc="Runtime libraries shipped by GCC (32-bit)" + depends=('lib32-glibc>=2.17' "gcc-libs>=$pkgver") + + cd ${srcdir}/gcc-build + make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared + for lib in libmudflap libgomp libstdc++-v3/src libitm libsanitizer/asan; do + make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libgfortran + make -j1 DESTDIR=${pkgdir} install-target-libobjc + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm ${pkgdir}/usr/lib32/libgfortran.spec + + # remove stuff in gcc-libs-multilib + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/info + + # remove static libraries + find ${pkgdir} -name *.a -delete + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION +} Deleted: gcc-4.7.1-libgo-write.patch =================================================================== --- gcc-4.7.1-libgo-write.patch 2013-03-29 22:06:27 UTC (rev 87325) +++ gcc-4.7.1-libgo-write.patch 2013-03-29 22:23:25 UTC (rev 87326) @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c ---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 -+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 -@@ -17,7 +17,8 @@ - G* g = runtime_g(); - - if(g == nil || g->writebuf == nil) { -- runtime_write(2, v, n); -+ ssize_t bytesWritten = runtime_write(2, v, n); -+ (void)bytesWritten; - return; - } -