[packages/valgrind] fix build with glibc-2.16, patch signed-off-by Khem Raj.
pluto
pluto at pld-linux.org
Sat Jul 21 10:57:36 CEST 2012
commit 7986a368d2e660149d2c2bfa5f045cfd8dd4c136
Author: Paweł Sikora <pawel.sikora at agmk.net>
Date: Sat Jul 21 10:56:39 2012 +0200
fix build with glibc-2.16, patch signed-off-by Khem Raj.
valgrind-glibc.patch | 19 ++++++++++++-------
valgrind.spec | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/valgrind-glibc.patch b/valgrind-glibc.patch
index 1353ad3..2dcbe2b 100644
--- 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}"
;;
@@ -13,15 +11,22 @@ Index: configure.in
+ 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 3041d48..3fdf1ea 100644
--- 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
More information about the pld-cvs-commit
mailing list