summaryrefslogtreecommitdiff
path: root/multilib-testing/lib32-glibc/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'multilib-testing/lib32-glibc/PKGBUILD')
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD195
1 files changed, 17 insertions, 178 deletions
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index f8bbb8476..5fd14ee1d 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72106 2012-06-08 20:59:52Z heftig $
+# $Id: PKGBUILD 73234 2012-07-04 01:11:56Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -8,221 +8,60 @@
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
-pkgver=2.15
-pkgrel=11
-_glibcdate=20111227
+pkgver=2.16.0
+pkgrel=1
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.6')
+makedepends=('gcc-multilib>=4.7')
options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
- glibc-2.15-do-not-install-timezone-files.patch
- glibc-2.15-do-not-install-timezone-files-2.patch
- glibc-__i686.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
+source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
glibc-2.15-fix-res_query-assert.patch
- glibc-2.15-regex.patch
- glibc-2.15-lddebug-scopes.patch
glibc-2.15-revert-c5a0802a.patch
- glibc-2.15-scanf.patch
- glibc-2.15-ifunc.patch
- glibc-2.15-avx.patch
- glibc-2.15-strcasecmp-disable-avx.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
- glibc-2.15-multiarch-x86-strcmp.patch
- glibc-2.15-vdso.patch
- glibc-2.15-feraiseexcept-plt.patch
- glibc-2.15-vfprintf-nargs.patch
- glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
- glibc-2.15-fmtmsg-locking.patch
- glibc-2.15-non-signalling-comparisons.patch
- 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'
- '6970bcfeb3bf88913436d5112d16f588'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
+md5sums=('80b181b02ab249524ec92822c0174cf7'
+ '2a1221a15575820751c325ef4d2fbb90'
'31f415b41197d85d3bbee3d1eecd06a3'
- 'b3526cbd5e29773560dba725db99af5a'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'f0782ddbf38e0b30ec6b85348816046f'
- '3d844b53b2dbb7c996e39c7ad932f55d'
- '41ae047ac88e8f6f547c70b0a0bc3b72'
- 'fccb89f6628f59752278e125c35941f8'
- '001a4044ac3d59aca6ee144eaca57ab2'
- '94b61302a7ca6c5764d013dc7738fcfe'
- 'a9ffadcfd2d357f91fee0b861fd4a7c6'
- '2c46b8e294de24c531f2253ff69aeef3'
- '7a2998a04ebfcf8bf820540f490ce714'
- '0d77d20fa7fe2f87ad945cb9edb4d91d'
- 'bfdefac3d705f41fbf84b1de1dc945af'
- '3443e89c1e98089cd6c3e3c23f0c3d85'
- '340deaa582a95ddde86edb624c3bfea0'
- '6bbac50e6ff82187654e6a0a7bd849e7'
- 'c483504cf404ed0b44480af627813a97'
- '1419d61fd1dbc6cdc48bb59da86fa66f'
- '7ff501435078b1a2622124fbeaafc921'
- '8d1023a51e0932681b46440d5f8551ee'
- '6962c3fa29306bfbf6f0d22b19cb825d'
+ '0a0383d50d63f1c02919fe9943b82014'
'6e052f1cb693d5d3203f50f9d4e8c33b')
build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da
- patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe
- patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch
-
- # undefine __i686
- # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures
- patch -p1 -i ${srcdir}/glibc-__i686.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
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
+ cd ${srcdir}/${_pkgbasename}-${pkgver}
# fix res_query assertion
# http://sourceware.org/bugzilla/show_bug.cgi?id=13013
patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
- # fix up regcomp/regexec
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
- patch -p1 -i ${srcdir}/glibc-2.15-regex.patch
-
- # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch)
- patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
# revert commit c5a0802a - causes various hangs
- # https://bugzilla.redhat.com/show_bug.cgi?id=769421
- # Note: fedora may have actual fix (not submitted upstream yet...)
- # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
+ # https://bugzilla.redhat.com/show_bug.cgi?id=552960
patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
- # fix realloc usage in vfscanf
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03
- patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch
-
- # fix ifunc relocations
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6
- patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch
-
- # fix AVX detection
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
- patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
- # and "fix" strcasecmp
- patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
-
- # fix GB18030 charmap
- # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79 (fedora branch)
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61 (fedora branch)
- 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)
- # reverts commit 3a2c0242 and other necessary following changes...
- patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
-
- # handle ARENA_TEST correctly
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
- patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
-
- # Do not cache negative results in nscd if these are transient
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
- patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
-
- # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
- patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
-
- # always set l_used for vDSO.
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
- patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
-
- # fix x86 PLT slot usage for feraiseexcept
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
- patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
-
- # vfprintf nargs overflow - CVE-2012-0864
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834
- patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
-
- # avoid out ouf bounds read in __libc_res_nquerydomain
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
- patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
-
- # make fmtmsg function thread-safe
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
- patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
-
- # use non-signaling floating-point comparisons in math functions
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
- patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
-
- # fix rintf rounding.
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
- patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
-
- # fix nearbyintf rounding
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
- patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
-
- # fix varaible scope issue in confstr
- # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0
- # 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
- export CC="gcc -m32"
# Hack to fix NPTL issues with Xen, only required on 32bit platforms
# TODO: make separate glibc-xen package for i686
export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+ export CC="gcc -m32"
echo "slibdir=/usr/lib32" >> configparms
# remove hardening options from CFLAGS for building libraries
CFLAGS=${CFLAGS/-fstack-protector/}
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
- ${srcdir}/glibc/configure --prefix=/usr \
+ ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
--libdir=/usr/lib32 --libexecdir=/usr/lib32 \
--with-headers=/usr/include \
--enable-add-ons=nptl,libidn \
+ --enable-obsolete-rpc \
--enable-kernel=2.6.32 \
--enable-bind-now --disable-profile \
+ --enable-stackguard-randomization \
--enable-multi-arch i686-unknown-linux-gnu
# build libraries with hardening disabled
@@ -265,9 +104,9 @@ package() {
strip $STRIP_STATIC usr/lib32/*.a
- 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 \
+ strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+ usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
usr/lib32/{pt_chown,{audit,gconv}/*.so}