Mon Aug 13 00:02:34 UTC 2012

2 files changed, 31 insertions, 22 deletions

diff --git a/multilib-staging/gcc-multilib/PKGBUILD b/multilib-staging/gcc-multilib/PKGBUILD
index d4a2f7ac2..3de3a535a 100644
--- a/multilib-staging/gcc-multilib/PKGBUILD
+++ b/multilib-staging/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73094 2012-07-01 03:25:23Z heftig $
+# $Id: PKGBUILD 75002 2012-08-11 11:41:09Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,28 +8,26 @@
 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=2
-#_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 for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
 makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.14')
+             'lib32-glibc>=2.16')
 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-multilib.patch
-	gcc-4.7.0-cloog-0.17.patch
-	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch)
-md5sums=('933e6f15f51c031060af64a9e14149ff'
-         '767c62f9a047c4434f2345decf1d0819'
+        gcc-4.7.1-libada-pic.patch
+        gcc-4.7.1-libgo-write.patch)
+md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
+         '79c4381f983b71868c02da3379e1e8a2'
          'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '575f7d17b022e609447a590e481b18b5'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
 
@@ -51,9 +49,6 @@ build() {
 
   patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch
 
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch
-
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
   patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
   
@@ -76,12 +71,13 @@ build() {
       --disable-libstdcxx-pch --enable-libstdcxx-time \
       --enable-gnu-unique-object --enable-linker-build-id \
       --with-ppl --enable-cloog-backend=isl \
+      --disable-ppl-version-check --disable-cloog-version-check \
       --enable-lto --enable-gold --enable-ld=default \
       --enable-plugin --with-plugin-ld=ld.gold \
       --with-linker-hash-style=gnu \
       --enable-multilib --disable-libssp \
       --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --enable-checking=release --with-fpmath=sse
+      --enable-checking=release
   make
 }
 
@@ -100,7 +96,7 @@ check() {
 package_gcc-libs-multilib()
 {
   pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.15' "lib32-gcc-libs=$pkgver-$pkgrel")
+  depends=('glibc>=2.16' "lib32-gcc-libs=$pkgver-$pkgrel")
   provides=("gcc-libs=$pkgver-$pkgrel")
   conflicts=('gcc-libs')
   install=gcc-libs.install
@@ -135,7 +131,7 @@ package_gcc-libs-multilib()
 package_lib32-gcc-libs()
 {
   pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.15' "gcc-libs>=$pkgver")
+  depends=('lib32-glibc>=2.16' "gcc-libs>=$pkgver")
 
   cd gcc-build
   make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
@@ -193,9 +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
-  #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/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
new file mode 100644
index 000000000..427efe8a6
--- /dev/null
+++ b/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
@@ -0,0 +1,15 @@
+--- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
++++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
+@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
+ # The rusage struct.
+ rusage=`grep '^type _rusage struct' gen-sysinfo.go`
+ if test "$rusage" != ""; then
+-  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
+-  rusage=`echo $rusage | sed -e 's/^ *//'`
+   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
+   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
++  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
++  rusage=`echo $rusage | sed -e 's/^ *//'`
+   nrusage=
+   while test -n "$rusage"; do
+     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`