Mon Aug 13 00:02:34 UTC 2012

7 files changed, 213 insertions, 28 deletions

diff --git a/staging/binutils/PKGBUILD b/staging/binutils/PKGBUILD
index 067cf289f..fc28ad232 100644
--- a/staging/binutils/PKGBUILD
+++ b/staging/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162862 2012-07-02 13:30:53Z allan $
+# $Id: PKGBUILD 165120 2012-08-11 08:23:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
 pkgver=2.22
-pkgrel=8
+pkgrel=10
 _date=20120323
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
@@ -36,6 +36,7 @@ build() {
   [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
 
   ${srcdir}/binutils/configure --prefix=/usr \
+    --with-lib-path=/usr/lib:/usr/local/lib \
     --enable-ld=default --enable-gold \
     --enable-plugins --enable-threads \
     --enable-shared $CONFIGFLAG
diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD
index 4c3dfc6f4..d047ccc8c 100644
--- a/staging/gcc/PKGBUILD
+++ b/staging/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162860 2012-07-02 13:12:42Z allan $
+# $Id: PKGBUILD 165125 2012-08-11 08:33:21Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,9 +6,9 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.7.1
-pkgrel=4
-#_snapshot=4.7-20120505
-_libstdcppmanver=20120605		# Note: check source directory name when updating this
+pkgrel=6
+_snapshot=4.7-20120721
+_libstdcppmanver=20120725		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -16,19 +16,17 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
 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
+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
 	gcc_pure64.patch
 	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch
-        gcc-4.7.1-libgo-mksysinfo.patch)
-md5sums=('933e6f15f51c031060af64a9e14149ff'
-         '767c62f9a047c4434f2345decf1d0819'
+	gcc-4.7.1-libgo-write.patch)
+md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
+         '79c4381f983b71868c02da3379e1e8a2'
          'ced48436c1b3c981d721a829f1094de1'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c'
-         '8e847244dba042d0aa3297713edaf70c')
+         'df82dd175ac566c8a6d46b11ac21f14c')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -56,9 +54,6 @@ build() {
   # bug to file...
   patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
 
-  # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
-  patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch
-
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -157,9 +152,7 @@ package_gcc()
   rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
   rm $pkgdir/usr/share/man/man3/ffi*
 
-  # many packages require these symlinks
-  #install -dm755 ${pkgdir}/lib
-  #ln -s /usr/bin/cpp ${pkgdir}/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/staging/glibc/PKGBUILD b/staging/glibc/PKGBUILD
index 69a502a4c..4331b76b5 100644
--- a/staging/glibc/PKGBUILD
+++ b/staging/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162892 2012-07-02 22:56:58Z allan $
+# $Id: PKGBUILD 165122 2012-08-11 08:27:45Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,13 +6,13 @@
 
 pkgname=glibc
 pkgver=2.16.0
-pkgrel=1
+pkgrel=3
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers>=3.4' 'tzdata')
+depends=('linux-api-headers>=3.5' 'tzdata')
 makedepends=('gcc>=4.7')
 backup=(etc/gai.conf
         etc/locale.gen
@@ -22,6 +22,7 @@ install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${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
         nscd.rcd
         nscd.service
         nscd.tmpfiles
@@ -31,6 +32,7 @@ md5sums=('80b181b02ab249524ec92822c0174cf7'
          '2a1221a15575820751c325ef4d2fbb90'
          '31f415b41197d85d3bbee3d1eecd06a3'
          '0a0383d50d63f1c02919fe9943b82014'
+         'ea6a43915474e8276e9361eed6a01280'
          '589d79041aa767a5179eaa4e2737dd3f'
          'ad8a9af15ab7eeaa23dc7ee85024af9f'
          'bccbe5619e75cf1d97312ec3681c605c'
@@ -48,6 +50,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
@@ -96,6 +102,8 @@ check() {
 package() {
   cd ${srcdir}/glibc-build
 
+  ln -s usr/lib ${pkgdir}/lib
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -123,7 +131,7 @@ package() {
   if [[ ${CARCH} = "x86_64" ]]; then
     # fix paths and compliance with binary blobs...
     sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    ln -s /lib ${pkgdir}/lib64
+    ln -s usr/lib ${pkgdir}/lib64
   fi
 
   # Do not strip the following files for improved debugging support
@@ -143,9 +151,9 @@ package() {
 
   strip $STRIP_STATIC usr/lib/*.a
 
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
+  strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
+                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
+                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib/{pt_chown,{audit,gconv}/*.so}
 }
diff --git a/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch b/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch
new file mode 100644
index 000000000..822b57294
--- /dev/null
+++ b/staging/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/staging/libmpc/PKGBUILD b/staging/libmpc/PKGBUILD
new file mode 100644
index 000000000..6a77bce43
--- /dev/null
+++ b/staging/libmpc/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 165110 2012-08-11 08:18:39Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=libmpc
+pkgver=1.0
+pkgrel=1
+pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
+arch=('i686' 'x86_64')
+url="http://www.multiprecision.org/"
+license=('LGPL')
+depends=('mpfr>=3.0.0')
+options=('!libtool')
+install=libmpc.install
+source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz)
+md5sums=('13370ceb2e266c5eeb2f7e78c24b7858')
+
+build() {
+  cd "${srcdir}/mpc-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "${srcdir}/mpc-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/mpc-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info
+}
diff --git a/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
new file mode 100644
index 000000000..3bf324728
--- /dev/null
+++ b/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
@@ -0,0 +1,63 @@
+--- trunk/configure.ac	2011/02/21 12:18:31	932
++++ trunk/configure.ac	2011/02/21 16:41:09	936
+@@ -33,7 +33,7 @@
+ AC_CANONICAL_HOST
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-dnl Extra arguments to configure
++# Extra arguments to configure
+ AC_ARG_WITH([mpfr_include],
+             [AC_HELP_STRING([--with-mpfr-include=DIR],
+                             [MPFR include directory])],
+@@ -85,18 +85,19 @@
+              )
+ 
+ 
+-dnl Setup CC and CFLAGS
++# Setup CC and CFLAGS
++AC_PROG_CC
++AC_LANG(C)
+ 
+-dnl Check for user specification of CC or CFLAGS
++# Set up LibTool
++AC_PROG_LIBTOOL
++
++# Check for user specification of CC or CFLAGS
+ if test -n "$CFLAGS" || test -n "$CC" ; then
+    user_redefine_cc=yes
+ fi
+ 
+-# Check for programs
+-AC_PROG_CC
+-AC_LANG(C)
+-
+-dnl Check GMP Header
++# Check GMP Header
+ AC_MSG_CHECKING(for gmp.h)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include "gmp.h"
+@@ -105,22 +106,19 @@
+  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
+ ])
+ 
+-dnl Check for GMP CFLAGS in gmp.h
++# Check for GMP CFLAGS in gmp.h
+ if test -z "$user_redefine_cc" ; then
+    MPC_GMP_CC_CFLAGS
+ fi
+ 
+ 
+-dnl Configs for Windows DLLs
++# Configs for Windows DLLs
+ case $host in
+   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      MPC_WINDOWS
+ esac
+ 
+ 
+-dnl Finally set up LibTool
+-AC_PROG_LIBTOOL
+-
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/staging/libmpc/libmpc.install b/staging/libmpc/libmpc.install
new file mode 100644
index 000000000..b0718c745
--- /dev/null
+++ b/staging/libmpc/libmpc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libmpc.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}