diff --git a/valgrind-3.5.0-glibc-2.13.patch b/valgrind-3.5.0-glibc-2.13.patch index f10a160..02c452a 100644 --- a/valgrind-3.5.0-glibc-2.13.patch +++ b/valgrind-3.5.0-glibc-2.13.patch @@ -1,8 +1,8 @@ --- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 +++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 -@@ -649,6 +649,16 @@ _ACEOF - GLIBC_VERSION="`$CPP conftest.$ac_ext | $SED -n 's/^glibc version is: //p' | $SED 's/ /./g'`" - fi +@@ -676,6 +676,16 @@ AC_EGREP_CPP([GLIBC_212], [ + ], + GLIBC_VERSION="2.12") +AC_EGREP_CPP([GLIBC_213], [ +#include @@ -17,7 +17,7 @@ AC_EGREP_CPP([AIX5_LIBC], [ #include #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in +@@ -776,6 +786,13 @@ case "${GLIBC_VERSION}" in DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -31,10 +31,10 @@ 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]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in +@@ -789,7 +806,7 @@ case "${GLIBC_VERSION}" in *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) + AC_MSG_RESULT(unsupported version) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12]) + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) @@ -42,7 +42,7 @@ ;; --- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 +++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 -@@ -33,6 +33,9 @@ +@@ -21,6 +21,9 @@ /* Define to 1 if you're using glibc 2.12.x */ #undef GLIBC_2_12 @@ -54,8 +54,8 @@ --- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 +++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 -@@ -6220,6 +6220,28 @@ fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -5069,6 +5069,28 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include @@ -83,7 +83,7 @@ #include #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530) AIX5_LIBC -@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_12 1" >>confde +@@ -5242,6 +5264,18 @@ _ACEOF DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ;; @@ -100,14 +100,16 @@ + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; aix5) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 - $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } -@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd + echo "$as_me:$LINENO: result: AIX 5.1 or 5.2 or 5.3" >&5 + echo "${ECHO_T}AIX 5.1 or 5.2 or 5.3" >&6 +@@ -5266,8 +5300,8 @@ _ACEOF *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.12" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 - as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; + echo "$as_me:$LINENO: result: unsupported version" >&5 + echo "${ECHO_T}unsupported version" >&6 +- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.12" >&5 +-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.12" >&2;} ++ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.13" >&5 ++echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.13" >&2;} + { (exit 1); exit 1; }; } + { { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5 + echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&2;} diff --git a/valgrind.spec b/valgrind.spec index 1fe1980..604e345 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -231,7 +231,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Feb 22 2011 Jakub Jelinek 3.5.0-20 -- rebuilt against glibc 2.13 +- rebuilt against glibc 2.13 (#676785) * Fri Nov 12 2010 Jakub Jelinek 3.5.0-19 - provide a replacement for str{,n}casecmp{,_l} (#626470)