summaryrefslogtreecommitdiff
path: root/multilib/lib32-glibc/PKGBUILD
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-05 00:02:54 +0000
committerroot <root@rshg054.dnsready.net>2012-07-05 00:02:54 +0000
commit7f6f69dc52c8601768ba48fa7b69507a80d532cb (patch)
tree028dd3e49c2080a2ab59860c0a20b3a8dfe5cdbf /multilib/lib32-glibc/PKGBUILD
parent298f654d4656dcc1e8d78c37dd77ae2ebfc1bf5f (diff)
Thu Jul 5 00:02:54 UTC 2012
Diffstat (limited to 'multilib/lib32-glibc/PKGBUILD')
-rw-r--r--multilib/lib32-glibc/PKGBUILD32
1 files changed, 14 insertions, 18 deletions
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index cf034c7d9..2fae57f62 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68827 2012-04-03 11:11:51Z allan $
+# $Id: PKGBUILD 73226 2012-07-04 00:49:28Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <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=10
+pkgrel=11
_glibcdate=20111227
pkgdesc="GNU C Library for multilib"
arch=('x86_64')
@@ -22,7 +22,6 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.15-do-not-install-timezone-files.patch
glibc-2.15-do-not-install-timezone-files-2.patch
glibc-__i686.patch
- glibc-2.12.2-ignore-origin-of-privileged-program.patch
glibc-2.14-libdl-crash.patch
glibc-2.14-reexport-rpc-interface.patch
glibc-2.14-reinstall-nis-rpc-headers.patch
@@ -34,7 +33,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.15-ifunc.patch
glibc-2.15-avx.patch
glibc-2.15-strcasecmp-disable-avx.patch
- glibc-2.15-gb18030.patch
+ glibc-2.15-gb18030.patch.gz
glibc-2.15-revert-netlink-cache.patch
glibc-2.15-arena.patch
glibc-2.15-negative-result-cache.patch
@@ -48,12 +47,12 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
glibc-2.15-rintf-rounding.patch
glibc-2.15-nearbyintf-rounding.patch
glibc-2.15-confstr-local-buffer-extent.patch
+ glibc-2.15-testsuite.patch
lib32-glibc.conf)
md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'7ef69c530a15106de93e4de2df2d393e'
'b6c619e5cf91829a15ce34dccef676d5'
'addfddd648a4bf832eb126aba944ebae'
- 'e60e33591c9ec1447e4cddadcbb9cf3a'
'6970bcfeb3bf88913436d5112d16f588'
'c5de2a946215d647c8af5432ec4b0da0'
'55febbb72139ac7b65757df085024b83'
@@ -65,7 +64,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'3d844b53b2dbb7c996e39c7ad932f55d'
'41ae047ac88e8f6f547c70b0a0bc3b72'
'fccb89f6628f59752278e125c35941f8'
- 'c4cd34f20ccd37817f6c1374bd4ee68e'
+ '001a4044ac3d59aca6ee144eaca57ab2'
'94b61302a7ca6c5764d013dc7738fcfe'
'a9ffadcfd2d357f91fee0b861fd4a7c6'
'2c46b8e294de24c531f2253ff69aeef3'
@@ -79,6 +78,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
'1419d61fd1dbc6cdc48bb59da86fa66f'
'7ff501435078b1a2622124fbeaafc921'
'8d1023a51e0932681b46440d5f8551ee'
+ '6962c3fa29306bfbf6f0d22b19cb825d'
'6e052f1cb693d5d3203f50f9d4e8c33b')
build() {
@@ -94,10 +94,6 @@ build() {
# http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures
patch -p1 -i ${srcdir}/glibc-__i686.patch
- # http://www.exploit-db.com/exploits/15274/
- # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (fedora branch)
# http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
@@ -148,7 +144,7 @@ build() {
patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch
# fix crash in __nscd_get_mapping if nscd not running
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
+ # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential fix in comment)
# reverts commit 3a2c0242 and other necessary following changes...
patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
@@ -201,6 +197,10 @@ build() {
# http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9
patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch
+ # fix testsuite failures with --as-needed
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=d4c2917f
+ patch -p1 -i ${srcdir}/glibc-2.15-testsuite.patch
+
cd ${srcdir}
mkdir glibc-build
cd glibc-build
@@ -222,9 +222,7 @@ build() {
--with-headers=/usr/include \
--enable-add-ons=nptl,libidn \
--enable-kernel=2.6.32 \
- --with-tls --with-__thread \
- --enable-bind-now --without-gd \
- --without-cvs --disable-profile \
+ --enable-bind-now --disable-profile \
--enable-multi-arch i686-unknown-linux-gnu
# build libraries with hardening disabled
@@ -232,7 +230,7 @@ build() {
make
# re-enable hardening for programs
- sed -i "s#=no#=yes#" configparms
+ sed -i "/build-programs=/s#no#yes#" configparms
echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
make
@@ -243,9 +241,7 @@ build() {
check() {
cd ${srcdir}/glibc-build
-
- # some errors are expected - manually check log files
- make -k check || true
+ make -k check
}
package() {