diff --git a/r7181.diff b/r7181.diff new file mode 100644 index 0000000..644b5a3 --- /dev/null +++ b/r7181.diff @@ -0,0 +1,86 @@ +Index: glibc-2.7.supp +=================================================================== +--- glibc-2.7.supp (revision 0) ++++ glibc-2.7.supp (revision 0) +@@ -0,0 +1,30 @@ ++ ++# Errors to suppress by default with glibc 2.7.x ++ ++# Format of this file is: ++# { ++# name_of_suppression ++# tool_name:supp_kind ++# (optional extra info for some suppression types) ++# caller0 name, or /name/of/so/file.so ++# caller1 name, or ditto ++# (optionally: caller2 name) ++# (optionally: caller3 name) ++# } ++# ++# For Memcheck, the supp_kinds are: ++# ++# Param Value1 Value2 Value4 Value8 Value16 Jump ++# Free Addr1 Addr2 Addr4 Addr8 Addr16 ++# Cond (previously known as Value0) ++# ++# and the optional extra info is: ++# if Param: name of system call param ++ ++{ ++ dl-hack3-1 ++ Memcheck:Cond ++ obj:/lib*/ld-2.7*.so* ++ obj:/lib*/ld-2.7*.so* ++ obj:/lib*/ld-2.7*.so* ++} +Index: configure.in +=================================================================== +--- configure.in (revision 7225) ++++ configure.in (working copy) +@@ -369,6 +369,16 @@ AC_EGREP_CPP([GLIBC_26], [ + ], + glibc="2.6") + ++AC_EGREP_CPP([GLIBC_27], [ ++#include ++#ifdef __GNU_LIBRARY__ ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7) ++ GLIBC_27 ++ #endif ++#endif ++], ++glibc="2.7") ++ + AC_MSG_CHECKING([the glibc version]) + + case "${glibc}" in +@@ -401,10 +411,15 @@ case "${glibc}" in + AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x]) + DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" + ;; +- ++ 2.7) ++ AC_MSG_RESULT(2.7 family) ++ AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x]) ++ DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ ;; + *) + AC_MSG_RESULT(unsupported version) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6]) ++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7]) + ;; + esac + +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 7225) ++++ Makefile.am (working copy) +@@ -18,6 +18,7 @@ DIST_SUBDIRS = $(SUBDIRS) + + SUPP_FILES = \ + glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ ++ glibc-2.6.supp glibc-2.7.supp \ + xfree-3.supp xfree-4.supp + + dist_val_DATA = $(SUPP_FILES) default.supp diff --git a/valgrind.changes b/valgrind.changes index 263831b..aa2e795 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 26 16:14:00 CET 2007 - dmueller@suse.de + +- fix build against glibc 2.7 + ------------------------------------------------------------------- Fri Sep 14 11:09:27 CEST 2007 - dmueller@suse.de diff --git a/valgrind.spec b/valgrind.spec index 1416de9..8048333 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -26,7 +26,7 @@ Group: Development/Tools/Debuggers Summary: Valgrind Suite of Tools for Debugging and Profiling BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.2.3 -Release: 54 +Release: 71 Source0: %{name}-%{version}.tar.bz2 # svn di svn://svn.valgrind.org/valgrind/tags/VALGRIND_3_2_1 svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH > 3_2_BRANCH.diff # svn di svn://svn.valgrind.org/vex/tags/VEX_3_2_1 svn://svn.valgrind.org/vex/branches/VEX_3_2_BRANCH > VEX_3_2_BRANCH.diff @@ -39,6 +39,7 @@ Patch8: jit-runtime-support.diff Patch9: glibc-2.6.1.diff Patch10: amd64-nop-prefixes.diff Patch11: massif-fixes.diff +Patch12: r7181.diff Provides: callgrind Obsoletes: callgrind ExclusiveArch: %ix86 x86_64 ppc ppc64 @@ -130,6 +131,7 @@ cd .. %patch9 %patch10 %patch11 +%patch12 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -159,6 +161,8 @@ mv $RPM_BUILD_ROOT/usr/share/doc/valgrind $RPM_BUILD_ROOT/usr/share/doc/packages %_libdir/valgrind/*/*.a %changelog +* Mon Nov 26 2007 - dmueller@suse.de +- fix build against glibc 2.7 * Fri Sep 14 2007 - dmueller@suse.de - fix divisions by zero in massif (#310234) * Wed Sep 12 2007 - dmueller@suse.de