- rel 4; glibc 2.15 support

Changed files:
    valgrind-glibc.patch -> 1.1
    valgrind.spec -> 1.88

diff --git a/valgrind-glibc.patch b/valgrind-glibc.patch
new file mode 100644 (file)
index 0000000..1353ad3
--- /dev/null
+++ b/valgrind-glibc.patch
@@ -0,0 +1,27 @@
+Index: configure.in
+===================================================================
+--- configure.in       (wersja 12322)
++++ configure.in       (wersja 12323)
+@@ -778,6 +778,13 @@
+       DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+       DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+       ;;
++     2.15)
++      AC_MSG_RESULT(2.15 family)
++      AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x])
++      DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++      DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++      DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++      ;;
+      darwin)
+       AC_MSG_RESULT(Darwin)
+       AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
+@@ -791,7 +798,7 @@
+ 
+      *)
+       AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
++      AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.15])
+       AC_MSG_ERROR([or Darwin libc])
+       ;;
+ esac

diff --git a/valgrind.spec b/valgrind.spec
index 7911f50ff475c5eca6f078bc8643ee467efa01b1..3041d4801ad251528cf8224ef7e3f85a311b075f 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -4,7 +4,7 @@ Summary:        An open-source memory debugger
 Summary(pl.UTF-8):     Otwarty odpluskwiacz pamięci
 Name:          valgrind
 Version:       3.7.0
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Tools
 Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
@@ -13,13 +13,14 @@ Patch0:             %{name}-debuginfo.patch
 Patch1:                %{name}-native-cpuid.patch
 Patch2:                %{name}-automake-1.11.2.patch
 Patch3:                %{name}-ld_linux_strlen.patch
+Patch4:                %{name}-glibc.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gcc >= 5:3.0
 # Needs libc.a
 BuildRequires: glibc-devel >= 6:2.2
-BuildRequires: glibc-devel < 6:2.15
+BuildRequires: glibc-devel < 6:2.16
 BuildRequires: glibc-static
 BuildRequires: libgomp-devel
 BuildRequires: libstdc++-devel
@@ -54,6 +55,7 @@ pracować.
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p0
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in