diff options
| author | root <root@rshg054.dnsready.net> | 2012-01-19 23:15:04 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-01-19 23:15:04 +0000 |
| commit | eefecc8813e0c062a2058b33209cb30830f824b6 (patch) | |
| tree | f2dd237a65b4a8a3587da4cb6ac211ae6048911f /multilib/lib32-glibc | |
| parent | 3e2075427791725d8e6a007feba107d94c017caf (diff) | |
Thu Jan 19 23:15:03 UTC 2012
Diffstat (limited to 'multilib/lib32-glibc')
| -rw-r--r-- | multilib/lib32-glibc/PKGBUILD | 18 | ||||
| -rw-r--r-- | multilib/lib32-glibc/lib32-glibc.conf | 1 |
2 files changed, 9 insertions, 10 deletions
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 4cca687a9..9b962e426 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61594 2012-01-04 01:24:30Z allan $ +# $Id: PKGBUILD 62206 2012-01-18 10:47:20Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=3 +pkgrel=3.1 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -43,7 +43,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' 'dc7550e659ddd685bd78a930d15a01f2' - 'a8f4549c716cd37244fbf1ed059497f8') + '6e052f1cb693d5d3203f50f9d4e8c33b') build() { cd ${srcdir}/glibc @@ -100,7 +100,7 @@ build() { # Hack to fix NPTL issues with Xen, only required on 32bit platforms export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - echo "slibdir=/lib32" >> configparms + echo "slibdir=/usr/lib32" >> configparms # remove hardening options from CFLAGS for building libraries CFLAGS=${CFLAGS/-fstack-protector/} @@ -158,15 +158,15 @@ package() { strip $STRIP_STATIC usr/lib32/*.a - strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ - lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib32/{libmemusage,libpcprofile,libSegFault}.so \ + strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ + usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker mkdir ${pkgdir}/lib - ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/ + ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/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" diff --git a/multilib/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf index a1c8c4199..9b08c3f43 100644 --- a/multilib/lib32-glibc/lib32-glibc.conf +++ b/multilib/lib32-glibc/lib32-glibc.conf @@ -1,2 +1 @@ -/lib32 /usr/lib32 |