diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2013-01-05 00:52:34 +0100 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2013-01-05 00:52:34 +0100 |
| commit | aea88eb401ee485c0d2ac87914f647f3bfc7d8fa (patch) | |
| tree | d3953577f739d0f1859e14419d1459e99f2e3386 | |
| parent | 4c76f29b450b5bfaf546ca7ae49569dd3e320882 (diff) | |
| download | aports-aea88eb401ee485c0d2ac87914f647f3bfc7d8fa.tar.bz2 aports-aea88eb401ee485c0d2ac87914f647f3bfc7d8fa.tar.xz | |
main/valgrind: fix build on eglibc 2.17
| -rw-r--r-- | main/valgrind/APKBUILD | 5 | ||||
| -rw-r--r-- | main/valgrind/valgrind-3.8.1-glibc-2.17.patch | 37 |
2 files changed, 40 insertions, 2 deletions
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index 33215c1f45..a04b508380 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -18,7 +18,7 @@ options="!strip" subpackages="$pkgname-dev $pkgname-doc" source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2 uclibc.patch - " + valgrind-3.8.1-glibc-2.17.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -61,4 +61,5 @@ package() { } md5sums="288758010b271119a0ffc0183f1d6e38 valgrind-3.8.1.tar.bz2 -c29b4572a070eb0d3a6a977be586c771 uclibc.patch" +c29b4572a070eb0d3a6a977be586c771 uclibc.patch +ee22605621de2672e517f37c2ff22f2d valgrind-3.8.1-glibc-2.17.patch" diff --git a/main/valgrind/valgrind-3.8.1-glibc-2.17.patch b/main/valgrind/valgrind-3.8.1-glibc-2.17.patch new file mode 100644 index 0000000000..32d0a98f8a --- /dev/null +++ b/main/valgrind/valgrind-3.8.1-glibc-2.17.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure +--- valgrind-3.8.1-orig/configure 2012-09-19 05:19:23.000000000 +1000 ++++ valgrind-3.8.1/configure 2012-12-27 08:11:36.645429011 +1000 +@@ -6612,6 +6612,24 @@ + + # DEFAULT_SUPP set by kernel version check above. + ;; ++ 2.17) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 ++$as_echo "2.17 family" >&6; } ++ ++$as_echo "#define GLIBC_2_17 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; } ++ ++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h ++ ++ # DEFAULT_SUPP set by kernel version check above. ++ ;; + bionic) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5 + $as_echo "Bionic" >&6; } +@@ -6624,7 +6642,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.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 |