diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 20:07:15 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 20:07:15 -0300 |
commit | e41246bc4c78478a71fe801a745210c931c5f2c5 (patch) | |
tree | 608517048d55c415b96b3223c9a7f9def316e87b /core/glibc | |
parent | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (diff) | |
parent | 901f55c6ae5b4888857cbdff1b6bc905264add5f (diff) |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el
Conflicts:
community/distcc/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/ushare/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/catdoc/PKGBUILD
extra/cups/PKGBUILD
extra/curl/PKGBUILD
extra/ethstatus/PKGBUILD
extra/ffcall/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-refocus/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/haskell-cgi/PKGBUILD
extra/haskell-deepseq/PKGBUILD
extra/haskell-haskell-src/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-hunit/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-opengl/PKGBUILD
extra/haskell-parallel/PKGBUILD
extra/krusader/PKGBUILD
extra/libmodplug/PKGBUILD
extra/metacity/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/openal/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/x2x/PKGBUILD
libre/kernel26-libre/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
Diffstat (limited to 'core/glibc')
-rw-r--r-- | core/glibc/PKGBUILD | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 13422a5de..0a99d9ff6 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -26,6 +26,7 @@ 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 @@ -35,21 +36,6 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t 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 @@ -80,6 +66,10 @@ 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 @@ -181,7 +171,7 @@ package() { usr/bin/{gencat,getconf,getent,iconv,locale} \ usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} + usr/sbin/{iconvconfig,nscd,rpcinfo} [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 strip $STRIP_STATIC usr/lib/*.a \ @@ -193,15 +183,3 @@ package() { lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } -md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' - '483f37cfdd619e81d8ca9e9d713944b5' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '24dfab6fd244f3773523412588ecc52c' - '7d0154b7e17ea218c9fa953599d24cc4' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') |