diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
| commit | 6feb300093e37e58027d52ca5734624565e09598 (patch) | |
| tree | 418d2cc8c7e631c42898a28731ade8a29e3cb955 /core/gcc | |
| parent | 216722b262c18f99fa53875247e7a258cb3b4b34 (diff) | |
| parent | d3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/openbox/PKGBUILD
community/powertop/PKGBUILD
core/libusb-compat/PKGBUILD
core/openssl/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/pidgin/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/xfce4-genmon-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/wine/PKGBUILD
testing/mdadm/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-server/git-fixes.patch
Diffstat (limited to 'core/gcc')
| -rw-r--r-- | core/gcc/PKGBUILD | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 09bc23ca6..94d280a9b 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156586 2012-04-21 10:26:57Z allan $ +# $Id: PKGBUILD 158746 2012-05-09 01:14:02Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,8 +10,8 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.7.0 -pkgrel=5 -_snapshot=4.7-20120414 +pkgrel=6 +_snapshot=4.7-20120505 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 gcc_pure64.patch gcc_mips64el_lib.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('9f9d082b64753d5908690500251fc52e' +md5sums=('8e2df3b9a755c9262db0df019cc3542e' '489d2f5311535800a120efd8d18db719' 'ced48436c1b3c981d721a829f1094de1' '474b8f5a7dee6ddd96b95a7240bfb961' @@ -164,8 +164,8 @@ package_gcc() 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} + 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 # unfortunately it is much, much easier to install the lot and clean-up the mess... # -f makes rm return 0 if the archive doesn't exist |