[gcc] 4.7.1-1

Jakub Jelinek jakub at fedoraproject.org
Fri Jun 29 12:26:09 UTC 2012


commit 8eaabf978c8f82e898ce43a2a1eeba53baee2125
Author: Jakub Jelinek <jakub at redhat.com>
Date:   Fri Jun 29 14:26:07 2012 +0200

    4.7.1-1

 gcc.spec                    |    2 ++
 gcc47-libgo-mksysinfo.patch |   15 +++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index d73020a..07dbee3 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -174,6 +174,7 @@ Patch12: gcc47-libstdc++-docs.patch
 Patch13: gcc47-no-add-needed.patch
 Patch14: gcc47-ppl-0.10.patch
 Patch15: gcc47-libitm-fno-exceptions.patch
+Patch16: gcc47-libgo-mksysinfo.patch
 
 Patch1000: fastjar-0.97-segfault.patch
 Patch1001: fastjar-0.97-len1.patch
@@ -675,6 +676,7 @@ package or when debugging this package.
 %patch14 -p0 -b .ppl-0.10~
 %endif
 %patch15 -p0 -b .libitm-fno-exceptions~
+%patch16 -p0 -b .libgo-mksysinfo~
 
 %if 0%{?_enable_debug_packages}
 cat > split-debuginfo.sh <<\EOF
diff --git a/gcc47-libgo-mksysinfo.patch b/gcc47-libgo-mksysinfo.patch
new file mode 100644
index 0000000..427efe8
--- /dev/null
+++ b/gcc47-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/'`


More information about the scm-commits mailing list