Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at Mon Aug 22 11:15:39 CEST 2011.
-------- --- valgrind/valgrind.changes 2011-07-05 15:10:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/valgrind/valgrind.changes 2011-08-19 19:24:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 19 19:24:37 CEST 2011 - [email protected] + +- fix build against glibc 2.14 +- require the right version of glibc at runtime + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- glibc-2.14.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.zHjTeI/_old 2011-08-22 11:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.zHjTeI/_new 2011-08-22 11:13:17.000000000 +0200 @@ -28,7 +28,7 @@ Summary: Memory Management Debugger BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.6.1 -Release: 9 +Release: 11 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 @@ -52,6 +52,11 @@ Patch43: vg_bug270856_r2136.patch Patch44: vg_bug270851_r2148.patch Patch45: valgrind-3.6.1-kernel3.patch +Patch46: glibc-2.14.diff +# hack around stupid rebuilding on openSUSE Factory +# during building the major version of glibc is built into the suppression file +# so we do require the exact same major version to be installed +Requires: glibc = %(getconf GNU_LIBC_VERSION | cut -d' ' -f2) %if %suse_version <= 1100 Provides: valgrind-devel = %version @@ -166,7 +171,8 @@ %patch42 %patch43 %patch44 -%patch45 -p1 +%patch45 +%patch46 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ glibc-2.14.diff ++++++ ------------------------------------------------------------------------ r11800 | tom | 2011-06-07 23:52:26 +0200 (Di, 07. Jun 2011) | 2 Zeilen Add glibc 2.14 support. Patch from Dmitry Djachenko <[email protected]>. ------------------------------------------------------------------------ Index: configure.in =================================================================== --- configure.in (Revision 11799) +++ configure.in (Revision 11800) @@ -779,6 +779,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.14) + AC_MSG_RESULT(2.14 family) + AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.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}" + ;; aix5) AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) @@ -792,7 +799,7 @@ case "${GLIBC_VERSION}" in *) AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) AC_MSG_ERROR([or Darwin libc]) ;; ++++++ valgrind-3.6.1-kernel3.patch ++++++ --- /var/tmp/diff_new_pack.zHjTeI/_old 2011-08-22 11:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.zHjTeI/_new 2011-08-22 11:13:17.000000000 +0200 @@ -1,13 +1,15 @@ -Index: valgrind-3.6.1/configure.in -=================================================================== ---- valgrind-3.6.1.orig/configure.in -+++ valgrind-3.6.1/configure.in -@@ -220,7 +220,7 @@ case "${host_os}" in +--- configure.in ++++ configure.in +@@ -225,9 +225,9 @@ case "${host_os}" in kernel=`uname -r` case "${kernel}" in - 2.6.*) -+ 2.6.*|3.*) - AC_MSG_RESULT([2.6 family (${kernel})]) - AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x]) +- AC_MSG_RESULT([2.6 family (${kernel})]) +- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x]) ++ 2.6.*|3.*) ++ AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) ++ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) ;; + + 2.4.*) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
