| 1 |
blueness 11/11/23 19:19:48 |
| 2 |
|
| 3 |
Modified: valgrind-3.7.0-fix-gcc-regex.patch |
| 4 |
Log: |
| 5 |
Replace original patch with the version accepted upstream |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: valgrind-3.7.0-fix-gcc-regex.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- valgrind-3.7.0-fix-gcc-regex.patch 11 Nov 2011 01:40:06 -0000 1.1 |
| 23 |
+++ valgrind-3.7.0-fix-gcc-regex.patch 23 Nov 2011 19:19:48 -0000 1.2 |
| 24 |
@@ -1,12 +1,35 @@ |
| 25 |
-diff -Naur valgrind-3.7.0.orig//configure.in valgrind-3.7.0/configure.in |
| 26 |
---- valgrind-3.7.0.orig//configure.in 2011-11-05 07:13:30.000000000 -0400 |
| 27 |
-+++ valgrind-3.7.0/configure.in 2011-11-10 18:13:39.000000000 -0500 |
| 28 |
-@@ -109,7 +109,7 @@ |
| 29 |
- | head -n 1 \ |
| 30 |
- | $SED 's/i686-apple-darwin10//' \ |
| 31 |
- | $SED 's/i686-apple-darwin11//' \ |
| 32 |
+Index: configure.in |
| 33 |
+=================================================================== |
| 34 |
+--- configure.in (revision 12273) |
| 35 |
++++ configure.in (revision 12274) |
| 36 |
+@@ -98,18 +98,21 @@ |
| 37 |
+ # We don't want gcc < 3.0 |
| 38 |
+ AC_MSG_CHECKING([for a supported version of gcc]) |
| 39 |
+ |
| 40 |
+-# Try to get the gcc version, sed-ing out some unexpected stuff |
| 41 |
+-# that appears with the default gcc on OSX 10.6 and 10.7 respectively. |
| 42 |
+-# Without this, the version number comes out as 686, 10 or 11 :-( |
| 43 |
++# Obtain the compiler version. |
| 44 |
+ # |
| 45 |
+-# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) |
| 46 |
+-# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) |
| 47 |
++# A few examples of how the ${CC} --version output looks like: |
| 48 |
+ # |
| 49 |
++# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2 |
| 50 |
++# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2 |
| 51 |
++# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585] |
| 52 |
++# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2 |
| 53 |
++# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) |
| 54 |
++# OS/X 10.7: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00) |
| 55 |
++# Clang: clang version 2.9 (tags/RELEASE_29/final) |
| 56 |
++# |
| 57 |
+ [gcc_version=`${CC} --version \ |
| 58 |
+- | head -n 1 \ |
| 59 |
+- | $SED 's/i686-apple-darwin10//' \ |
| 60 |
+- | $SED 's/i686-apple-darwin11//' \ |
| 61 |
- | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] |
| 62 |
-+ | $SED 's/.*\s\([.0-9]*\)$/\1/'`] |
| 63 |
++ | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \ |
| 64 |
++ -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`] |
| 65 |
|
| 66 |
is_clang="notclang" |
| 67 |
if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then |
Archives