Merge branch 'master' of ssh://gparabola/abslibre-mips64el

Conflicts:
	core/glibc/PKGBUILD

1 files changed, 27 insertions, 11 deletions

diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 64b7a0131..730c7f46c 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145917 2012-01-04 01:25:10Z allan $
+# $Id: PKGBUILD 147715 2012-01-27 11:00:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,10 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=3
+pkgrel=4
 _glibcdate=20111227
+_glibcportsver=2.15
+_glibcportsdate=20120127
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
@@ -20,8 +22,8 @@ backup=(etc/gai.conf
         etc/nscd.conf)
 options=('!strip')
 install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        http://repo.parabolagnulinux.org/other/glibc-ports-${pkgver}_${_glibcdate}.tar.xz
+source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
+        http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz
         glibc-2.10-dont-build-timezone.patch
         glibc-2.10-bz4781.patch
         glibc-__i686.patch
@@ -30,13 +32,15 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
+        glibc-2.15-regex.patch
         glibc-2.15-lddebug-scopes.patch
         glibc-2.15-revert-c5a0802a.patch
-        glibc-2.15-math64crash.patch
+        glibc-2.15-strcmp-disable-avx.patch
         nscd
         locale.gen.txt
         locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
+         '935995663b89924a98d20a636045949a'
          '4dadb9203b69a3210d53514bb46f41c3'
          '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
@@ -45,9 +49,10 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
+         'b3526cbd5e29773560dba725db99af5a'
          '3c219ddfb619b6df903cac4cc42c611d'
          '7ae3e426251ae33e73dbad71f9c91378'
-         'dc7550e659ddd685bd78a930d15a01f2'
+         '7a44dd821835e4984aa75ad44fad3baf'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -65,9 +70,9 @@ mksource() {
 mksource-ports() {
   git clone http://sourceware.org/git/glibc-ports.git
   pushd glibc-ports
-  git checkout -b glibc-${pkgver}-arch origin/release/${pkgver}/master
+  git checkout -b glibc-${_glibcportsver}-arch origin/release/${_glibcportsver}/master
   popd
-  tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/*
+  tar -cvJf glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-ports/*
 }
 
 build() {
@@ -104,6 +109,10 @@ build() {
   # 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
 
+  # Fix up regcomp/regexec
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
+  patch -Np1 -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  (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
@@ -112,12 +121,19 @@ build() {
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
-  # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # obviously not a real fix...
-  patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
+  # Disable AVX in strcmp as this breaks Xen
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13583
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch
+
+  # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743)
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13618
+  rm sysdeps/x86_64/fpu/multiarch/*
 
   ln -s ../glibc-ports ports
 
+  # Fix typo making util-linux build fail.
+  sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf