Thu Jun 21 00:01:36 UTC 2012

3 files changed, 50 insertions, 13 deletions

diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
index d3522eb43..a46b67ee0 100644
--- a/multilib/gcc-multilib/PKGBUILD
+++ b/multilib/gcc-multilib/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 70473 2012-05-09 08:18:45Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# $Id: PKGBUILD 72673 2012-06-19 12:27:24Z allan $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -7,10 +7,10 @@
 
 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.0
-pkgrel=6
-_snapshot=4.7-20120505
-_libstdcppmanver=20120307		# Note: check source directory name when updating this
+pkgver=4.7.1
+pkgrel=1
+#_snapshot=4.7-20120505
+_libstdcppmanver=20120605		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -19,15 +19,19 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
              'lib32-glibc>=2.14')
 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)
-md5sums=('8e2df3b9a755c9262db0df019cc3542e'
-         '489d2f5311535800a120efd8d18db719'
+	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'
          'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '575f7d17b022e609447a590e481b18b5')
+         '575f7d17b022e609447a590e481b18b5'
+         '2acbc9d35cc9d72329dc71d6b1f162ef'
+         'df82dd175ac566c8a6d46b11ac21f14c')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -50,6 +54,12 @@ build() {
   # 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
+  
+  # bug to file...
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -102,6 +112,7 @@ package_gcc-libs-multilib()
   done
   make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
   make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
 
   make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
   make -j1 DESTDIR=${pkgdir} install-target-libgfortran
@@ -218,7 +229,8 @@ 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}/libstdc++-api.${_libstdcppmanver}.man/man3/* \
+    ${pkgdir}/usr/share/man/man3/
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch
new file mode 100644
index 000000000..591da1e4a
--- /dev/null
+++ b/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
+--- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
++++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
+@@ -54,7 +54,7 @@
+ PICFLAG = @PICFLAG@
+ GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
+ GNATLIBCFLAGS= -g -O2
+-GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
++GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
+ 	-fexceptions -DIN_RTS @have_getipinfo@
+ 
+ host_subdir = @host_subdir@
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch
new file mode 100644
index 000000000..a7be83fda
--- /dev/null
+++ b/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch
@@ -0,0 +1,13 @@
+diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
+--- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
++++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
+@@ -17,7 +17,8 @@
+ 	G* g = runtime_g();
+ 
+ 	if(g == nil || g->writebuf == nil) {
+-		runtime_write(2, v, n);
++		ssize_t bytesWritten = runtime_write(2, v, n);
++		(void)bytesWritten;
+ 		return;
+ 	}
+