[arch-commits] Commit in gcc/trunk (3 files)

[Allan McRae]

    Date: Saturday, June 16, 2012 @ 01:09:39
  Author: allan
Revision: 161889

fix up patches

Modified:
  gcc/trunk/PKGBUILD
  gcc/trunk/gcc-4.7.1-libada-pic.patch
  gcc/trunk/gcc-4.7.1-libgo-write.patch

-----------------------------+
 PKGBUILD                    |    6 +++---
 gcc-4.7.1-libada-pic.patch  |    9 +++++----
 gcc-4.7.1-libgo-write.patch |   15 ++++++++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-16 04:46:41 UTC (rev 161888)
+++ PKGBUILD	2012-06-16 05:09:39 UTC (rev 161889)
@@ -27,8 +27,8 @@
          '767c62f9a047c4434f2345decf1d0819'
          'ced48436c1b3c981d721a829f1094de1'
          '575f7d17b022e609447a590e481b18b5'
-         'd18397f44276a21a906c447488b65354'
-         'e1655d0cd519d1938a1504a9b4a5bea1')
+         '2acbc9d35cc9d72329dc71d6b1f162ef'
+         'df82dd175ac566c8a6d46b11ac21f14c')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -57,7 +57,7 @@
   patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
   
   # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
 
   echo ${pkgver} > gcc/BASE-VER
 

Modified: gcc-4.7.1-libada-pic.patch
===================================================================
--- gcc-4.7.1-libada-pic.patch	2012-06-16 04:46:41 UTC (rev 161888)
+++ gcc-4.7.1-libada-pic.patch	2012-06-16 05:09:39 UTC (rev 161889)
@@ -1,11 +1,12 @@
---- old/gcc-4.7-20120609/libada/Makefile.in	2012-05-06 09:27:25.000000000 +0000
-+++ new/gcc-4.7.1/libada/Makefile.in	2012-06-12 15:12:37.000000000 +0000
+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) $(PICFLAG) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
+-GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
++GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
  	-fexceptions -DIN_RTS @have_getipinfo@
  
  host_subdir = @host_subdir@

Modified: gcc-4.7.1-libgo-write.patch
===================================================================
--- gcc-4.7.1-libgo-write.patch	2012-06-16 04:46:41 UTC (rev 161888)
+++ gcc-4.7.1-libgo-write.patch	2012-06-16 05:09:39 UTC (rev 161889)
@@ -1,8 +1,13 @@
---- file_not_specified_in_diff	
-+++ file_not_specified_in_diff	
-@@ -1,2 +1,3 @@ 
---- gcc-4.7.1/libgo/runtime/print.c
-+++ gcc-4.7.1/libgo/runtime/print.c
+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;
+ 	}
+