fix build with glibc-2.16, patch signed-off-by Khem Raj.

diff --git a/valgrind-glibc.patch b/valgrind-glibc.patch
index 1353ad3e3ebbc1e37b352b64e735139151d249b0..2dcbe2b1b94ce5ea6cad7ead545d6176de7166d9 100644 (file)
--- a/valgrind-glibc.patch
+++ b/valgrind-glibc.patch
@@ -1,8 +1,6 @@
-Index: configure.in
-===================================================================
---- configure.in       (wersja 12322)
-+++ configure.in       (wersja 12323)
-@@ -778,6 +778,13 @@
+--- configure.in.orig  2011-11-05 12:13:30.000000000 +0100
++++ configure.in       2012-07-21 10:52:16.246714671 +0200
+@@ -775,6 +775,20 @@
        DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
        DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
        ;;
@@ -12,16 +10,23 @@ Index: configure.in
 +      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}"
++      ;;
++     2.16)
++      AC_MSG_RESULT(2.16 family)
++      AC_DEFINE([GLIBC_2_16], 1, [Define to 1 if you're using glibc 2.16.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 @@
+@@ -788,7 +802,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([Valgrind requires glibc version 2.2 - 2.16])
        AC_MSG_ERROR([or Darwin libc])
        ;;
  esac

diff --git a/valgrind.spec b/valgrind.spec
index 3041d4801ad251528cf8224ef7e3f85a311b075f..3fdf1ea4d831c2a205c76a6f60c64250fc2f9c37 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -20,7 +20,7 @@ BuildRequires:        automake
 BuildRequires: gcc >= 5:3.0
 # Needs libc.a
 BuildRequires: glibc-devel >= 6:2.2
-BuildRequires: glibc-devel < 6:2.16
+BuildRequires: glibc-devel < 6:2.17
 BuildRequires: glibc-static
 BuildRequires: libgomp-devel
 BuildRequires: libstdc++-devel