| 1 | diff -druN src.orig/configure src/configure |
| 2 | --- src.orig/configure 2012-09-18 21:19:23.000000000 +0200 |
| 3 | +++ src/configure 2013-10-07 22:54:30.530691187 +0200 |
| 4 | @@ -6604,6 +6604,26 @@ |
| 5 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 6 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 7 | ;; |
| 8 | + 2.17) |
| 9 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 |
| 10 | +$as_echo "2.17 family" >&6; } |
| 11 | + |
| 12 | +$as_echo "#define GLIBC_2_17 1" >>confdefs.h |
| 13 | + |
| 14 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 15 | + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 16 | + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 17 | + ;; |
| 18 | + 2.18) |
| 19 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.18 family" >&5 |
| 20 | +$as_echo "2.18 family" >&6; } |
| 21 | + |
| 22 | +$as_echo "#define GLIBC_2_18 1" >>confdefs.h |
| 23 | + |
| 24 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 25 | + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 26 | + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 27 | + ;; |
| 28 | darwin) |
| 29 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 |
| 30 | $as_echo "Darwin" >&6; } |
| 31 | @@ -6624,7 +6644,7 @@ |
| 32 | *) |
| 33 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 |
| 34 | $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } |
| 35 | - as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 |
| 36 | + as_fn_error "Valgrind requires glibc version 2.2 - 2.18" "$LINENO" 5 |
| 37 | as_fn_error "or Darwin libc" "$LINENO" 5 |
| 38 | ;; |
| 39 | esac |
| 40 | diff -druN src.orig/configure.in src/configure.in |
| 41 | --- src.orig/configure.in 2012-09-18 21:17:32.000000000 +0200 |
| 42 | +++ src/configure.in 2013-10-07 22:54:21.542757756 +0200 |
| 43 | @@ -906,6 +906,20 @@ |
| 44 | DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 45 | DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 46 | ;; |
| 47 | + 2.17) |
| 48 | + AC_MSG_RESULT(2.17 family) |
| 49 | + AC_DEFINE([GLIBC_2_17], 1, [Define to 1 if you're using glibc 2.17.x]) |
| 50 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 51 | + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 52 | + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 53 | + ;; |
| 54 | + 2.18) |
| 55 | + AC_MSG_RESULT(2.18 family) |
| 56 | + AC_DEFINE([GLIBC_2_18], 1, [Define to 1 if you're using glibc 2.18.x]) |
| 57 | + DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" |
| 58 | + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" |
| 59 | + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" |
| 60 | + ;; |
| 61 | darwin) |
| 62 | AC_MSG_RESULT(Darwin) |
| 63 | AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) |
| 64 | @@ -919,7 +933,7 @@ |
| 65 | |
| 66 | *) |
| 67 | AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) |
| 68 | - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.16]) |
| 69 | + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.18]) |
| 70 | AC_MSG_ERROR([or Darwin libc]) |
| 71 | ;; |
| 72 | esac |