diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-01-01 15:38:30 +0100 |
| commit | b63a03da360e5a18e9044e7058ae69898db5ffb0 (patch) | |
| tree | 2901728a2c53e2eb590d577db1531ee2976a2cbf /core/gcc/PKGBUILD | |
| parent | 73346505421c2d923e13e2020dd31ddd764b8fe4 (diff) | |
| parent | 26ac5932cb02318206fa6a528ed4bd82ad6af87c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/blender/PKGBUILD
community/cdfs/PKGBUILD
community/cdfs/cdfs.install
community/mc/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/open-vm-tools-modules/modprobe.conf
community/open-vm-tools-modules/open-vm-tools-modules.install
community/open-vm-tools/PKGBUILD
community/open-vm-tools/open-vm-tools.conf.d
community/open-vm-tools/open-vm-tools.rc.d
community/open-vm-tools/scripts-network-FS19541.patch
community/pekwm/PKGBUILD
community/r8168-lts/PKGBUILD
community/simutrans/PKGBUILD
community/spectrwm/PKGBUILD
community/supertuxkart/PKGBUILD
community/tp_smapi/PKGBUILD
community/tp_smapi/tp_smapi.install
community/vhba-module/PKGBUILD
community/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/glibc/PKGBUILD
extra/fcgi/PKGBUILD
extra/gst-plugins-bad/PKGBUILD
extra/imap/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/lirc/PKGBUILD
extra/lirc/lirc.install
extra/llvm/PKGBUILD
extra/nvidia-304xx-utils/PKGBUILD
extra/ruby/PKGBUILD
extra/xscreensaver/PKGBUILD
Diffstat (limited to 'core/gcc/PKGBUILD')
| -rw-r--r-- | core/gcc/PKGBUILD | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index a19046150..47f33edef 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169769 2012-10-28 11:11:42Z allan $ +# $Id: PKGBUILD 173936 2012-12-28 13:10:57Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,7 +10,7 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.7.2 -pkgrel=2 +pkgrel=3 #_snapshot=4.7-20120721 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -127,7 +127,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.16') + depends=('glibc>=2.17') install=gcc-libs.install cd ${srcdir}/gcc-build @@ -175,10 +175,10 @@ package_gcc() # -f makes rm return 0 if the archive doesn't exist rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} rm -f $pkgdir/usr/lib/*.so* - rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm -f $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc}.a rm -f $pkgdir/usr/lib/libgfortran.spec rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a rm -fr $pkgdir/usr/lib/go @@ -236,18 +236,15 @@ package_gcc-fortran() install=gcc-fortran.install cd ${srcdir}/gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=$pkgdir install-target-libgfortran make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm -f ${pkgdir}/usr/share/info/libquadmath.info - ln -s gfortran ${pkgdir}/usr/bin/f95 + rm ${pkgdir}/usr/lib/libgfortran.so* + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION |