From 608a49084f8c6599f8adef56b6c1480c3e293c04 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Apr 2012 00:01:23 +0000 Subject: Thu Apr 5 00:01:22 UTC 2012 --- multilib/gcc-multilib/PKGBUILD | 85 ++++++++++++------------ multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch | 24 +++++++ multilib/gcc-multilib/gcc_pure64-multilib.patch | 38 +++++------ 3 files changed, 84 insertions(+), 63 deletions(-) create mode 100644 multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch (limited to 'multilib/gcc-multilib') diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 35f6feba2..7fa7442b6 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67114 2012-03-04 14:27:51Z allan $ +# $Id: PKGBUILD 68826 2012-04-03 11:11:16Z allan $ # Maintainer: Jan "heftig" Steffens # Contributor: Allan McRae @@ -7,10 +7,10 @@ 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.6.3 -pkgrel=1 -#_snapshot=4.6-20120120 -_libstdcppmanver=20111215 +pkgver=4.7.0 +pkgrel=3 +_snapshot=4.7-20120324 +_libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,17 +19,16 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'lib32-glibc>=2.14') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -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 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.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 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch - gcc-hash-style-both.patch - gcc-4.6.2-cloog-0.17.patch) -md5sums=('773092fe5194353b02bb0110052a972e' - '450772ce32daed97d7383199f8797f33' - '7da5b7ab75b3c29993f953b18bc38579' - '4df25b623799b148a0703eaeec8fdf3f' - '6d9939a2e667376031679ac9f9c49263') + gcc-4.7.0-cloog-0.17.patch) +md5sums=('947f9a70dcbb4baaf20b1e95b518048e' + '489d2f5311535800a120efd8d18db719' + 'ec24c32d3d1030c2bc8cb2ad2d1dc629' + '575f7d17b022e609447a590e481b18b5') + if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -46,11 +45,10 @@ build() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch # compatibility with latest cloog - patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch + patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch echo ${pkgver} > gcc/BASE-VER @@ -70,7 +68,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --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 \ --enable-checking=release --with-fpmath=sse make } @@ -90,14 +90,14 @@ check() { package_gcc-libs-multilib() { pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel") + depends=('glibc>=2.15' "lib32-gcc-libs=$pkgver-$pkgrel") provides=("gcc-libs=$pkgver-$pkgrel") conflicts=('gcc-libs') install=gcc-libs.install cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install @@ -108,10 +108,10 @@ package_gcc-libs-multilib() make -j1 DESTDIR=${pkgdir} install-target-libobjc # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} # remove stuff in lib32-gcc-libs - rm -rf ${pkgdir}/usr/lib32 + rm -r ${pkgdir}/usr/lib32 # remove static libraries find ${pkgdir} -name *.a -delete @@ -124,11 +124,11 @@ package_gcc-libs-multilib() package_lib32-gcc-libs() { pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver") + depends=('lib32-glibc>=2.15' "gcc-libs>=$pkgver") cd gcc-build make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; do make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done @@ -140,8 +140,8 @@ package_lib32-gcc-libs() rm ${pkgdir}/usr/lib32/libgfortran.spec # remove stuff in gcc-libs-multilib - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/info + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/info # remove static libraries find ${pkgdir} -name *.a -delete @@ -162,35 +162,30 @@ package_gcc-multilib() cd gcc-build - # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install + + install -d $pkgdir/usr/share/gdb/auto-load + mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load} + + # 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,quadmath}.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,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a} + 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}.info + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,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* # many packages require these symlinks install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # plugin headers are all over the place at the moment... - for i in common objc pragma pretty-print; do - ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h - done + ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" @@ -223,7 +218,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/ + install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -248,7 +243,9 @@ package_gcc-fortran-multilib() # remove libraries included in gcc-libs rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* rm ${pkgdir}/usr/share/info/libquadmath.info - + + ln -s gfortran ${pkgdir}/usr/bin/f95 + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION @@ -290,6 +287,8 @@ package_gcc-ada-multilib() make -j1 DESTDIR=${pkgdir} INSTALL="install" \ INSTALL_DATA="install -m644" install-gnatlib + ln -s gcc ${pkgdir}/usr/bin/gnatgcc + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION diff --git a/multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch new file mode 100644 index 000000000..c7146fa04 --- /dev/null +++ b/multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch @@ -0,0 +1,24 @@ +diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure +--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 ++++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 +@@ -6049,8 +6049,8 @@ + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + + if test "${cloog_org}" = yes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 ++$as_echo_n "checking for version 0.17 of CLooG... " >&6; } + if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6061,8 +6061,7 @@ + main () + { + #if CLOOG_VERSION_MAJOR != 0 \ +- || CLOOG_VERSION_MINOR != 16 \ +- || CLOOG_VERSION_REVISION < 1 ++ || CLOOG_VERSION_MINOR != 17 + choke me + #endif + ; diff --git a/multilib/gcc-multilib/gcc_pure64-multilib.patch b/multilib/gcc-multilib/gcc_pure64-multilib.patch index 73df6b873..b5576ae0e 100644 --- a/multilib/gcc-multilib/gcc_pure64-multilib.patch +++ b/multilib/gcc-multilib/gcc_pure64-multilib.patch @@ -1,24 +1,22 @@ -diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h ---- gcc-4.6-20111223/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h 2012-01-14 19:52:33.688573352 +0100 -@@ -63,7 +63,7 @@ - done. */ +diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h +--- gcc-4.7.0/gcc/config/i386/linux64.h 2011-07-07 17:38:34.000000000 +0200 ++++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h 2012-03-24 11:52:58.926204014 +0100 +@@ -29,5 +29,5 @@ + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" -diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 ---- gcc-4.6-20111223/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 2012-01-14 19:50:27.346242617 +0100 -@@ -25,7 +25,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" +diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64 +--- gcc-4.7.0/gcc/config/i386/t-linux64 2011-11-02 16:23:48.000000000 +0100 ++++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64 2012-03-24 11:52:44.119651885 +0100 +@@ -34,6 +34,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64 +-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_OSDIRNAMES+= mx32=../libx32 -- cgit v1.2.3-54-g00ecf