Fri Aug 17 00:02:30 UTC 2012

5 files changed, 88 insertions, 15 deletions

diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD
index 8ef046b5c..b633b2483 100644
--- a/multilib/binutils-multilib/PKGBUILD
+++ b/multilib/binutils-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73281 2012-07-05 13:48:33Z allan $
+# $Id: PKGBUILD 75201 2012-08-16 01:54:04Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -6,7 +6,7 @@
 
 pkgname=binutils-multilib
 pkgver=2.22
-pkgrel=8
+pkgrel=10
 _date=20120323
 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
 arch=('x86_64')
@@ -28,6 +28,7 @@ build() {
   mkdir binutils-build && cd binutils-build
 
   ${srcdir}/binutils/configure --prefix=/usr \
+    --with-lib-path=/usr/lib:/usr/local/lib \
     --enable-ld=default --enable-gold \
     --enable-plugins --enable-threads \
     --enable-shared \
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index c4cd43fb8..652b61189 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74215 2012-07-23 02:58:40Z allan $
+# $Id: PKGBUILD 75202 2012-08-16 01:54:15Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <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.7.1
-pkgrel=5
+pkgrel=6
 _snapshot=4.7-20120721
-_libstdcppmanver=20120605		# Note: check source directory name when updating this
+_libstdcppmanver=20120725		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -26,7 +26,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
         gcc-4.7.1-libada-pic.patch
         gcc-4.7.1-libgo-write.patch)
 md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
-         '767c62f9a047c4434f2345decf1d0819'
+         '79c4381f983b71868c02da3379e1e8a2'
          'ec24c32d3d1030c2bc8cb2ad2d1dc629'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
@@ -189,8 +189,7 @@ package_gcc-multilib()
   rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
   rm $pkgdir/usr/share/man/man3/ffi*
 
-  # many packages require these symlinks
-  ln -s /usr/bin/cpp ${pkgdir}/usr/lib/cpp
+  # many packages expect this symlinks
   ln -s gcc ${pkgdir}/usr/bin/cc
 
   # POSIX conformance launcher scripts for c89 and c99
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
index d741bae12..6fc66149f 100644
--- a/multilib/lib32-glibc/PKGBUILD
+++ b/multilib/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73695 2012-07-14 13:05:07Z allan $
+# $Id: PKGBUILD 75203 2012-08-16 01:54:21Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.16.0
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libc"
@@ -19,11 +19,13 @@ options=('!strip' '!emptydirs')
 source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
         glibc-2.15-fix-res_query-assert.patch
         glibc-2.15-revert-c5a0802a.patch
+        glibc-2.16-rpcgen-cpp-path.patch
         lib32-glibc.conf)
 md5sums=('80b181b02ab249524ec92822c0174cf7'
          '2a1221a15575820751c325ef4d2fbb90'
          '31f415b41197d85d3bbee3d1eecd06a3'
          '0a0383d50d63f1c02919fe9943b82014'
+         'ea6a43915474e8276e9361eed6a01280'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
@@ -37,6 +39,10 @@ build() {
   # https://bugzilla.redhat.com/show_bug.cgi?id=552960
   patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
+  # prevent need for /lib/cpp symlink
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
+  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
diff --git a/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
new file mode 100644
index 000000000..822b57294
--- /dev/null
+++ b/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
@@ -0,0 +1,68 @@
+diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
+index 06d951a..2103b10 100644
+--- a/sunrpc/rpc_main.c
++++ b/sunrpc/rpc_main.c
+@@ -75,12 +75,9 @@ struct commandline
+ 
+ static const char *cmdname;
+ 
+-#define SVR4_CPP "/usr/ccs/lib/cpp"
+-#define SUNOS_CPP "/lib/cpp"
+-
+ static const char *svcclosetime = "120";
+ static int cppDefined;	/* explicit path for C preprocessor */
+-static const char *CPP = SUNOS_CPP;
++static const char *CPP = "/lib/cpp";
+ static const char CPPFLAGS[] = "-C";
+ static char *pathbuf;
+ static int cpp_pid;
+@@ -327,23 +324,17 @@ find_cpp (void)
+ {
+   struct stat buf;
+ 
+-  if (stat (CPP, &buf) < 0)
+-    {				/* /lib/cpp or explicit cpp does not exist */
+-      if (cppDefined)
+-	{
+-	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
+-	  crash ();
+-	}
+-      else
+-	{			/* try the other one */
+-	  CPP = SVR4_CPP;
+-	  if (stat (CPP, &buf) < 0)
+-	    {			/* can't find any cpp */
+-	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
+-	      crash ();
+-	    }
+-	}
++  if (stat (CPP, &buf) == 0)
++    return;
++
++  if (cppDefined) /* user specified cpp but it does not exist */
++    {
++      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
++      crash ();
+     }
++
++  /* fall back to system CPP */
++  CPP = "cpp";
+ }
+ 
+ /*
+@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
+       close (1);
+       dup2 (pd[1], 1);
+       close (pd[0]);
+-      execv (arglist[0], (char **) arglist);
+-      perror ("execv");
++      execvp (arglist[0], (char **) arglist);
++      if (errno == ENOENT)
++        {
++          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
++          exit (1);
++        }
++      perror ("execvp");
+       exit (1);
+     case -1:
+       perror ("fork");
diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
index 53f5e7083..ec136b54f 100644
--- a/multilib/lib32-libdrm/PKGBUILD
+++ b/multilib/lib32-libdrm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73096 2012-07-01 09:30:06Z lcarlier $
+# $Id: PKGBUILD 75184 2012-08-15 09:39:43Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgbasename=libdrm
 pkgname=lib32-$_pkgbasename
-pkgver=2.4.37
+pkgver=2.4.38
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services (32-bit)"
 arch=(x86_64)
@@ -15,9 +15,8 @@ options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
         no-pthread-stubs.patch)
-#	git_fixes.diff)
-sha1sums=('fa8463e390eee9b589dc369abc4cbe3e4ef16d16'
-          '2a5410baa3e6e078f9378ce486a88f41d22fd838')
+sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9'
+            'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7')
 
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"