Accepting request 146741 from devel:tools

- Fix last patch

OBS-URL: https://build.opensuse.org/request/show/146741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/valgrind?expand=0&rev=74
This commit is contained in:
Ismail Dönmez 2012-12-31 18:32:39 +00:00 committed by Git OBS Bridge
commit f1354411e7
2 changed files with 14 additions and 21 deletions

View File

@ -1,30 +1,18 @@
Index: valgrind-3.8.1/configure
Index: valgrind-3.8.1/configure.in
===================================================================
--- valgrind-3.8.1.orig/configure
+++ valgrind-3.8.1/configure
@@ -6604,6 +6604,16 @@ $as_echo "#define GLIBC_2_16 1" >>confde
--- valgrind-3.8.1.orig/configure.in
+++ valgrind-3.8.1/configure.in
@@ -906,6 +906,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.17)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
+$as_echo "2.17 family" >&6; }
+
+$as_echo "#define GLIBC_2_17 1" >>confdefs.h
+
+ AC_MSG_RESULT(2.17 family)
+ AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.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)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
$as_echo "Darwin" >&6; }
@@ -6624,7 +6634,7 @@ $as_echo "#define BIONIC_LIBC 1" >>confd
*)
{ $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.16" "$LINENO" 5
+ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
as_fn_error "or Darwin libc" "$LINENO" 5
;;
esac
AC_MSG_RESULT(Darwin)
AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 31 14:26:31 UTC 2012 - idonmez@suse.com
- Fix last patch
-------------------------------------------------------------------
Mon Dec 31 09:12:06 UTC 2012 - idonmez@suse.com