diff options
Diffstat (limited to 'core/glibc/PKGBUILD')
| -rw-r--r-- | core/glibc/PKGBUILD | 59 |
1 files changed, 45 insertions, 14 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 4be9dd5a7..13422a5de 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z allan $ +# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each new glibc version pkgname=glibc -pkgver=2.13 -pkgrel=5 -_glibcdate=20110117 +pkgver=2.14 +pkgrel=4 +_glibcdate=20110617 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=2.6.37' 'tzdata') +depends=('linux-api-headers>=2.6.39' 'tzdata') makedepends=('gcc>=4.4') backup=(etc/locale.gen etc/nscd.conf) @@ -26,16 +26,35 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-__i686.patch 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 + glibc-2.14-libdl-crash.patch + #glibc-2.14-fix-resolver-crash-typo.patch + glibc-2.14-revert-4462fad3.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch nscd locale.gen.txt locale-gen) +md5sums=('e441d745609d93c907b72548ba646dad' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc - git checkout -b glibc-2.13-arch origin/release/2.13/master + git checkout -b glibc-2.14-arch origin/release/2.14/master popd tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* } @@ -61,13 +80,25 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - # http://sourceware.org/bugzilla/show_bug.cgi?id=12489 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # This fixes the main segfault but not the assert fail (FS#24615) + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 + #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch + # resort to reverting the bad commit completely for the moment + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -112,7 +143,7 @@ package() { cd ${srcdir}/glibc-build make install_root=${pkgdir} install - rm ${pkgdir}/etc/ld.so.{cache,conf} + rm -f ${pkgdir}/etc/ld.so.{cache,conf} install -dm755 ${pkgdir}/etc/rc.d install -dm755 ${pkgdir}/usr/sbin @@ -150,7 +181,7 @@ package() { usr/bin/{gencat,getconf,getent,iconv,locale} \ usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd,rpcinfo} + usr/sbin/{iconvconfig,nscd} [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 strip $STRIP_STATIC usr/lib/*.a \ @@ -160,7 +191,7 @@ 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} + usr/lib/{pt_chown,{audit,gconv}/*.so} } md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' '483f37cfdd619e81d8ca9e9d713944b5' |