Accepting request 128757 from devel:tools

Handle glibc 2.16 (forwarded request 128609 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/128757
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=68
This commit is contained in:
Stephan Kulow 2012-07-25 14:22:15 +00:00 committed by Git OBS Bridge
commit 318c316cfe
3 changed files with 19 additions and 10 deletions

View File

@ -1,14 +1,11 @@
------------------------------------------------------------------------
r12323 | dirk | 2011-12-29 09:24:55 +0100 (Thu, 29 Dec 2011) | 2 lines
add support for glibc 2.15
add support for glibc 2.15 and glibc 2.16
------------------------------------------------------------------------
Index: configure.in
===================================================================
--- configure.in (revision 12322)
+++ configure.in (revision 12323)
@@ -778,6 +778,13 @@ case "${GLIBC_VERSION}" in
--- configure.in.orig
+++ configure.in
@@ -775,6 +775,20 @@ case "${GLIBC_VERSION}" in
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
@ -18,16 +15,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 @@ case "${GLIBC_VERSION}" in
@@ -788,7 +802,7 @@ case "${GLIBC_VERSION}" in
*)
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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jul 22 06:31:31 UTC 2012 - aj@suse.de
- Support glibc 2.16.
-------------------------------------------------------------------
Mon Jun 4 17:38:56 UTC 2012 - dmueller@suse.com

View File

@ -39,7 +39,7 @@ Source0: %{name}-%{version}.tar.bz2
# svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_5_0 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_5_BRANCH > 3_5_BRANCH.diff
# svn di svn://svn.valgrind.org/vex/tags/VEX_3_5_0 svn://svn.valgrind.org/vex/branches/VEX_3_5_BRANCH > VEX_3_5_BRANCH.diff
Patch1: jit-register-unregister.diff
Patch2: glibc-2.15.diff
Patch2: glibc.diff
# added automake 1.11.2 patch https://bugs.kde.org/show_bug.cgi?id=290719 algrind-3.7.0-automake-1.11.2.patch
Patch3: valgrind-3.7.0-automake-1.11.2.patch
# during building the major version of glibc is built into the suppression file