diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
| commit | 18d6577d511b9a1ac36eaae50060133a401e42a3 (patch) | |
| tree | f681f9444a7a0a95916de40af82d3b805d5fb8d3 /core/glibc | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Wed Apr 27 22:24:53 UTC 2011
Diffstat (limited to 'core/glibc')
| -rw-r--r-- | core/glibc/PKGBUILD | 14 | ||||
| -rw-r--r-- | core/glibc/glibc-2.13-futex.patch | 31 |
2 files changed, 40 insertions, 5 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6ae2db02f..60aeb8ae6 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110236 2011-02-18 04:46:54Z allan $ +# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z 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.13 -pkgrel=4 +pkgrel=5 _glibcdate=20110117 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -26,6 +26,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-prelink.patch + glibc-2.13-futex.patch nscd locale.gen.txt locale-gen) @@ -36,6 +37,7 @@ md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -74,9 +76,7 @@ build() { patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - if [[ $CARCH == "x86_64" ]]; then - sed -i '/__ASSUME_PRIVATE_FUTEX/d' $srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h - fi + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -103,6 +103,10 @@ build() { --disable-multi-arch make +} + +check() { + cd ${srcdir}/glibc-build # some errors are expected - manually check log files make -k check || true diff --git a/core/glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/core/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) |