From b7c6c9c7844914d1d0617a24b9e3a84d691d1f64 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 7 Jul 2012 00:02:03 +0000
Subject: Sat Jul  7 00:02:03 UTC 2012

---
 multilib/gcc-multilib/PKGBUILD                        | 19 ++++++++++++-------
 multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch

(limited to 'multilib/gcc-multilib')

diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index d60b23620..ee8e8f639 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73180 2012-07-03 10:45:06Z allan $
+# $Id: PKGBUILD 73282 2012-07-05 13:48:44Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -8,7 +8,7 @@
 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=3
+pkgrel=4
 #_snapshot=4.7-20120505
 _libstdcppmanver=20120605		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
@@ -16,7 +16,7 @@ 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
@@ -24,12 +24,14 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64-multilib.patch
 	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch)
+	gcc-4.7.1-libgo-write.patch
+        gcc-4.7.1-libgo-mksysinfo.patch)
 md5sums=('933e6f15f51c031060af64a9e14149ff'
          '767c62f9a047c4434f2345decf1d0819'
          'ec24c32d3d1030c2bc8cb2ad2d1dc629'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
+         'df82dd175ac566c8a6d46b11ac21f14c'
+         '8e847244dba042d0aa3297713edaf70c')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -55,6 +57,9 @@ 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}
@@ -96,7 +101,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
@@ -131,7 +136,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
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
new file mode 100644
index 000000000..427efe8a6
--- /dev/null
+++ b/multilib/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/'`
-- 
cgit v1.2.3-54-g00ecf