diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
| commit | a4c358009dd89183b4124505c694ea7f5fcdbeec (patch) | |
| tree | 2b157b1e89ca7df45bd35f6a72c39b26af558827 /multilib/gcc-multilib | |
| parent | d7d02f7c02a5c761e8a64df49598ae976640e450 (diff) | |
Sat Aug 27 23:14:39 UTC 2011
Diffstat (limited to 'multilib/gcc-multilib')
| -rw-r--r-- | multilib/gcc-multilib/PKGBUILD | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 5071a49b7..7f2b02f87 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54542 2011-08-20 07:14:14Z allan $ +# $Id: PKGBUILD 54869 2011-08-26 22:10:40Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,9 +8,9 @@ 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.1 -pkgrel=3 -#_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this +pkgrel=4 +_snapshot=4.6-20110819 +_libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,13 +19,13 @@ makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multili '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 +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.patch gcc-hash-style-both.patch) -md5sums=('c57a9170c677bf795bdc04ed796ca491' - '1e9fd2eaf0ee47ea64e82c48998f1999' +md5sums=('b14d22730f9085eab7fd927039e68d28' + 'ce920d2550ff7e042b9f091d27764d8f' '22cec272f9cc2801d3cd348feaca888b' '4df25b623799b148a0703eaeec8fdf3f') @@ -64,24 +64,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libstdcxx-pch \ + --enable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release make - - # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2 - # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...) - cd $CHOST/libssp - sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ - -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile - make clean - make - - # rebuild 32-bit libssp - cd ../32/libssp - sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ - -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile - make clean - make } check() { @@ -106,7 +91,7 @@ package_gcc-libs-multilib() cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install @@ -137,7 +122,7 @@ package_lib32-gcc-libs() cd gcc-build make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done |