diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/valgrind/patches/patch-configure | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/valgrind/patches/patch-configure')
| -rw-r--r-- | package/valgrind/patches/patch-configure | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/package/valgrind/patches/patch-configure b/package/valgrind/patches/patch-configure index 07bea76d5..9867b5309 100644 --- a/package/valgrind/patches/patch-configure +++ b/package/valgrind/patches/patch-configure @@ -1,6 +1,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- valgrind-3.3.1.orig/configure 2008-06-01 03:44:42.000000000 +0200 -+++ valgrind-3.3.1/configure 2009-06-02 01:32:59.000000000 +0200 ++++ valgrind-3.3.1/configure 2009-12-12 00:28:43.000000000 +0100 +@@ -4129,7 +4129,7 @@ echo "${ECHO_T}ok (${host_os})" >&6 + echo "$as_me:$LINENO: checking for the kernel version" >&5 + echo $ECHO_N "checking for the kernel version... $ECHO_C" >&6 + +- kernel=`uname -r` ++ kernel=2.6.32 + + case "${kernel}" in + 2.6.*) @@ -4637,6 +4637,27 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& fi rm -f conftest* @@ -14,15 +23,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ + +#include <features.h> +#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 10) -+ GLIBC_210 ++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11) ++ GLIBC_211 + #endif +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "GLIBC_210" >/dev/null 2>&1; then -+ libc="2.10" ++ $EGREP "GLIBC_211" >/dev/null 2>&1; then ++ libc="2.11" +fi +rm -f conftest* + @@ -33,12 +42,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ;; -+ 2.10) -+ echo "$as_me:$LINENO: result: 2.10 family" >&5 -+echo "${ECHO_T}2.10 family" >&6 ++ 2.11) ++ echo "$as_me:$LINENO: result: 2.11 family" >&5 ++echo "${ECHO_T}2.11 family" >&6 + +cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_10 1 ++#define GLIBC_2_11 1 +_ACEOF + + DEFAULT_SUPP="glibc-2.8.supp ${DEFAULT_SUPP}" |