Wed Dec 28 23:14:43 UTC 2011

3 files changed, 36 insertions, 49 deletions

diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
index 5cef1fa67..bb3bab55d 100644
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ b/multilib-testing/binutils-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59997 2011-12-03 03:15:32Z heftig $
+# $Id: PKGBUILD 61270 2011-12-27 21:42:32Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -6,8 +6,8 @@
 
 pkgname=binutils-multilib
 pkgver=2.22
-pkgrel=1
-_date=20111201
+pkgrel=4
+_date=20111227
 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/binutils/"
@@ -20,7 +20,7 @@ makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-mult
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
 source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('77c15027ac112c65fd5f73ca91b0651c')
+md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
 
 build() {
   cd ${srcdir}
@@ -36,6 +36,17 @@ build() {
   make configure-host
 
   make tooldir=${pkgdir}/usr
+
+  # Rebuild libiberty.a with -fPIC
+  cp -a libiberty libiberty-pic
+  make -C libiberty-pic clean
+  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
+
+  # Rebuild libbfd.a with -fPIC
+  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
+  cp -a bfd bfd-pic
+  make -C bfd-pic clean
+  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
 }
 
 check() {
@@ -53,16 +64,9 @@ package() {
   install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
   install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
 
-  # Rebuild libiberty.a with -fPIC
-  make -C libiberty clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty
-  install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib
-
-  # Rebuild libbfd.a with -fPIC
-  make -C bfd clean
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd
-  install -m644 bfd/libbfd.a ${pkgdir}/usr/lib
+  # install libraries rebuilt with -fPIC
+  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
+  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
 
   # Remove Windows/Novell specific man pages
   rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
index 2ce757d3f..18b7d8c1a 100644
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59998 2011-12-03 03:38:14Z heftig $
+# $Id: PKGBUILD 61271 2011-12-27 21:56:13Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,9 +8,9 @@
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.6.2
-pkgrel=2
-_snapshot=4.6-20111125
-_libstdcppmanver=20110814		# Note: check source directory name when updating this
+pkgrel=5
+_snapshot=4.6-20111223
+_libstdcppmanver=20111215
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -21,11 +21,11 @@ checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
 	gcc-hash-style-both.patch)
-md5sums=('922b0ee688669c188d237bbd21d42d07'
-         'ce920d2550ff7e042b9f091d27764d8f'
+md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
+         '450772ce32daed97d7383199f8797f33'
          '4030ee1c08dd1e843c0225b772360e76'
          '4df25b623799b148a0703eaeec8fdf3f')
 
@@ -65,7 +65,7 @@ build() {
       --enable-lto --enable-gold --enable-ld=default \
       --enable-plugin --with-plugin-ld=ld.gold \
       --enable-multilib --disable-libssp --disable-libstdcxx-pch \
-      --enable-checking=release
+      --enable-checking=release --with-fpmath=sse
   make
 }
 
@@ -212,7 +212,7 @@ EOF
 
   # install the libstdc++ man pages
   install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+  install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 59f17da2a..cf07c0b27 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 60806 2011-12-18 13:40:00Z heftig $
+# $Id: PKGBUILD 61269 2011-12-27 21:40:57Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuild with each new glibc version
+# NOTE: valgrind requires rebuilt with each major glibc version
 
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
-pkgver=2.14.1
-pkgrel=4
-_glibcdate=20111025
+pkgver=2.15
+pkgrel=1
+_glibcdate=20111227
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
@@ -22,27 +22,21 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
         glibc-2.10-dont-build-timezone.patch
         glibc-2.10-bz4781.patch
         glibc-__i686.patch
-        glibc-2.12.1-static-shared-getpagesize.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
         glibc-2.14-revert-4768ae77.patch
         glibc-2.14-reexport-rpc-interface.patch
         glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.14.1-tzfile-overflow.patch
         lib32-glibc.conf)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
          '0c5540efc51c0b93996c51b57a8540ae'
          '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
          'b042647ea7d6f22ad319e12e796bd13e'
-         '7d0154b7e17ea218c9fa953599d24cc4'
          '6970bcfeb3bf88913436d5112d16f588'
          '7da8c554a3b591c7401d7023b1928afc'
          'c5de2a946215d647c8af5432ec4b0da0'
          '55febbb72139ac7b65757df085024b83'
-         '178779bfaa1418c709f31c25eb3d8a3e'
          'a8f4549c716cd37244fbf1ed059497f8')
 
 build() {
@@ -58,24 +52,17 @@ build() {
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
-  # using Fedora "fix" as patch in that bug report causes breakages...
-  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
   # http://www.exploit-db.com/exploits/15274/
   # 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=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
 
   # Revert commit causing issues with crappy DNS servers...
   # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches do not fix the issue completely:
+  # Note that both these patches appear not to fix the issue completely:
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
@@ -86,10 +73,6 @@ 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
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13506
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654
-  patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch
-
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
@@ -140,7 +123,7 @@ package() {
   cd ${srcdir}/glibc-build
   make install_root=${pkgdir} install
 
-  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}}
+  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
 
   # We need one 32 bit specific header file
   find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
@@ -158,7 +141,7 @@ package() {
   strip $STRIP_STATIC usr/lib32/*.a
 
   strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
-                      lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
+                      lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
                       lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
                       lib32/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib32/{pt_chown,{audit,gconv}/*.so}