Accepting request 98400 from devel:tools

- fix build against glibc 2.15

OBS-URL: https://build.opensuse.org/request/show/98400
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=62
This commit is contained in:
Stephan Kulow
2011-12-31 16:20:27 +00:00
committed by Git OBS Bridge
3 changed files with 41 additions and 0 deletions

33
glibc-2.15.diff Normal file
View File

@@ -0,0 +1,33 @@
------------------------------------------------------------------------
r12323 | dirk | 2011-12-29 09:24:55 +0100 (Thu, 29 Dec 2011) | 2 lines
add support for glibc 2.15
------------------------------------------------------------------------
Index: configure.in
===================================================================
--- configure.in (revision 12322)
+++ configure.in (revision 12323)
@@ -778,6 +778,13 @@ case "${GLIBC_VERSION}" in
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 @@ 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([or Darwin libc])
;;
esac

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 29 09:33:04 CET 2011 - dmueller@suse.de
- fix build against glibc 2.15
-------------------------------------------------------------------
Mon Dec 19 06:53:32 UTC 2011 - adrian@suse.de

View File

@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: valgrind
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -38,6 +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
# during building the major version of glibc is built into the suppression file
%define glibc_main_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f1)
%define glibc_major_version %(getconf GNU_LIBC_VERSION | cut -d' ' -f2 | cut -d. -f2)
@@ -134,6 +136,7 @@ Authors:
cd VEX
cd ..
%patch1
%patch2
%build
%ifarch %arm