diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 21:39:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 21:39:50 -0300 |
| commit | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (patch) | |
| tree | 1f5ef1cf64d8477147f581592b19c94bcaafd917 /extra/valgrind | |
| parent | 2bd8076ad5b2278e808a796d572bb99a7fccf52a (diff) | |
| parent | 85828cc2c2c3ef5c0b9b03388b9323d3d163b389 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/avidemux/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/qimageblitz/PKGBUILD
extra/valgrind/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
staging/kdeutils/PKGBUILD
Diffstat (limited to 'extra/valgrind')
| -rw-r--r-- | extra/valgrind/valgrind-3.7.0-glibc-2.15.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch new file mode 100644 index 000000000..fa400b953 --- /dev/null +++ b/extra/valgrind/valgrind-3.7.0-glibc-2.15.patch @@ -0,0 +1,30 @@ +diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure +--- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 ++++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 +@@ -6402,6 +6402,17 @@ + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.15) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 ++$as_echo "2.15 family" >&6; } ++ ++$as_echo "#define GLIBC_2_15 1" >>confdefs.h ++ ++ 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; } +@@ -6422,7 +6433,7 @@ + *) + { $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.14" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac |