/[gentoo-x86]/dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch
Gentoo

Contents of /dev-util/valgrind/files/valgrind-3.7.0-fix-gcc-regex.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed Nov 23 19:19:48 2011 UTC (2 years, 9 months ago) by blueness
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +31 -8 lines
Replace original patch with the version accepted upstream

(Portage version: 2.1.10.11/cvs/Linux x86_64)

1 Index: configure.in
2 ===================================================================
3 --- configure.in (revision 12273)
4 +++ configure.in (revision 12274)
5 @@ -98,18 +98,21 @@
6 # We don't want gcc < 3.0
7 AC_MSG_CHECKING([for a supported version of gcc])
8
9 -# Try to get the gcc version, sed-ing out some unexpected stuff
10 -# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
11 -# Without this, the version number comes out as 686, 10 or 11 :-(
12 +# Obtain the compiler version.
13 #
14 -# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
15 -# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
16 +# A few examples of how the ${CC} --version output looks like:
17 #
18 +# Arch Linux: i686-pc-linux-gnu-gcc (GCC) 4.6.2
19 +# Debian Linux: gcc (Debian 4.3.2-1.1) 4.3.2
20 +# openSUSE: gcc (SUSE Linux) 4.5.1 20101208 [gcc-4_5-branch revision 167585]
21 +# Exherbo Linux: x86_64-pc-linux-gnu-gcc (Exherbo gcc-4.6.2) 4.6.2
22 +# OS/X 10.6: i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
23 +# 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)
24 +# Clang: clang version 2.9 (tags/RELEASE_29/final)
25 +#
26 [gcc_version=`${CC} --version \
27 - | head -n 1 \
28 - | $SED 's/i686-apple-darwin10//' \
29 - | $SED 's/i686-apple-darwin11//' \
30 - | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
31 + | $SED -n -e 's/[^ ]*gcc[^ ]* ([^)]*) \([0-9.]*\).*$/\1/p' \
32 + -e 's/[^ ]*clang version \([0-9.]*\).*$/\1/p'`]
33
34 is_clang="notclang"
35 if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then

  ViewVC Help
Powered by ViewVC 1.1.20