summaryrefslogtreecommitdiff
path: root/testing/glibc/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'testing/glibc/PKGBUILD')
-rw-r--r--testing/glibc/PKGBUILD15
1 files changed, 9 insertions, 6 deletions
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
index 51a4b2ae0..3c31ac43a 100644
--- a/testing/glibc/PKGBUILD
+++ b/testing/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126794 2011-06-07 10:57:24Z allan $
+# $Id: PKGBUILD 127202 2011-06-11 08:46:22Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.14
-pkgrel=1
+pkgrel=2
_glibcdate=20110605
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
@@ -27,6 +27,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
glibc-2.12.2-ignore-origin-of-privileged-program.patch
glibc-2.13-futex.patch
glibc-2.14-libdl-crash.patch
+ glibc-2.14-revert-4462fad3.patch
nscd
locale.gen.txt
locale-gen)
@@ -38,6 +39,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000'
'b042647ea7d6f22ad319e12e796bd13e'
'7d0154b7e17ea218c9fa953599d24cc4'
'cea62cc6b903d222c5f26e05a3c0e0e6'
+ '46e56492cccb1c9172ed3a235cf43c6c'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -79,6 +81,10 @@ build() {
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
+ # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684
+ # as it causes crashes (FS#24615)
+ patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+
install -dm755 ${pkgdir}/etc
touch ${pkgdir}/etc/ld.so.conf
@@ -165,8 +171,5 @@ package() {
lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
lib/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib/{pt_chown,gconv/*.so}
-
-# add usr/lib/audit/sotruss-lib.so, usr/bin/sotruss
-
+ usr/lib/{pt_chown,{audit,gconv}/*.so}
}