diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 11:21:01 -0300 |
| commit | b337b14a9cce5d126d55695c97698484ac52a8ea (patch) | |
| tree | 8aa6281e14d6bd9b0876ae0e641d76de9e51cce0 /core/gcc | |
| parent | 66873986693bc3c8812d12f3919f1977b9a30674 (diff) | |
| parent | 079c689ef9b252fd82dbf9b182ec2517c48f8737 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/conkeror-git/PKGBUILD
community/spidermonkey/PKGBUILD
core/gcc/PKGBUILD
extra/file-roller/PKGBUILD
extra/pixman/PKGBUILD
extra/poppler/PKGBUILD
extra/qtiplot/PKGBUILD
extra/xulrunner/PKGBUILD
extra/xulrunner/xulrunner-omnijar.patch
kde-unstable/akonadi/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/gcc')
| -rw-r--r-- | core/gcc/PKGBUILD | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 4d699a833..9b0b02234 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129471 2011-06-28 04:17:45Z allan $ +# $Id: PKGBUILD 130912 2011-07-09 03:10:41Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.6.1 -pkgrel=1 +pkgrel=2 pkgver=4.6.0 pkgrel=7 # hold ver #_snapshot=4.6-20110603 @@ -44,8 +44,8 @@ build() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/gcc_pure64.patch + if [ "${CARCH}" = "x86_64" ]; then + patch -Np1 -i ${srcdir}/gcc_pure64.patch elif [ "${CARCH}" = "mips64el" ]; then patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch fi @@ -137,6 +137,7 @@ package_gcc() rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,libgfortranbegin.a} rm $pkgdir/usr/share/man/man1/gfortran.1 + rm $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -144,6 +145,10 @@ package_gcc() 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}/ + # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" #!/bin/sh |