diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-09 00:02:00 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-09 00:02:00 +0000 |
| commit | 6f492df5ae2ab0d2bd117d6f1c458d52e2e24585 (patch) | |
| tree | 51e61122d46459be560a778ce76bdf527edf5334 /multilib-testing | |
| parent | a522a5f63f3b5726081698bf742801fb1d242817 (diff) | |
Mon Jul 9 00:02:00 UTC 2012
Diffstat (limited to 'multilib-testing')
| -rw-r--r-- | multilib-testing/lib32-glibc/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 5fd14ee1d..69c1a2c63 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73234 2012-07-04 01:11:56Z heftig $ +# $Id: PKGBUILD 73419 2012-07-07 13:03:07Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,12 +9,11 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.7') options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} @@ -48,6 +47,7 @@ build() { export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" export CC="gcc -m32" + export CXX="g++ -m32" echo "slibdir=/usr/lib32" >> configparms # remove hardening options from CFLAGS for building libraries @@ -111,8 +111,8 @@ package() { usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker - mkdir ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ + mkdir ${pkgdir}/usr/lib + ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/ # Add lib32 paths to the default library search path install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" |