diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-03 06:17:08 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-03 06:17:08 +0000 |
| commit | 666d44087bf57a53ac594d26b1c5d698c4eba81a (patch) | |
| tree | b67478660a934d0395380fd1424acb3804cc63ab /main/valgrind | |
| parent | cb0156de92e1ece4564e847da81e95b343721394 (diff) | |
| download | aports-666d44087bf57a53ac594d26b1c5d698c4eba81a.tar.bz2 aports-666d44087bf57a53ac594d26b1c5d698c4eba81a.tar.xz | |
main/valgrind: build fix for musl
Diffstat (limited to 'main/valgrind')
| -rw-r--r-- | main/valgrind/APKBUILD | 19 | ||||
| -rw-r--r-- | main/valgrind/musl-fixes.patch | 11 | ||||
| -rw-r--r-- | main/valgrind/valgrind-3.4.0-uclibc.patch | 12 |
3 files changed, 24 insertions, 18 deletions
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index c32b5df7f..8c5f1e68a 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=valgrind pkgver=3.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="all" license="GPL2+" depends="" # it seems like busybox sed works but the configure script requires GNU sed -makedepends="sed paxctl pax-utils perl bash" +makedepends="sed paxctl pax-utils perl bash + autoconf automake libtool" # from README_PACKAGERS: # Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so # in the installation tree. Either Valgrind won't work at all, or it @@ -18,17 +19,20 @@ options="!strip" subpackages="$pkgname-dev $pkgname-doc" source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2 uclibc.patch + musl-fixes.patch " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - update_config_sub || return 1 for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + aclocal && autoconf && automake --add-missing || return 1 + update_config_sub || return 1 + echo '#include <linux/a.out.h>' > include/a.out.h } build() { @@ -66,8 +70,11 @@ package() { } md5sums="0947de8112f946b9ce64764af7be6df2 valgrind-3.9.0.tar.bz2 -c29b4572a070eb0d3a6a977be586c771 uclibc.patch" +c29b4572a070eb0d3a6a977be586c771 uclibc.patch +3ed330adde2776d6b2365a95aa682f2b musl-fixes.patch" sha256sums="e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 valgrind-3.9.0.tar.bz2 -fab5afea5cb7abec79ff68088d97ccc188613c733b4dfc8ede029cb818ec397f uclibc.patch" +fab5afea5cb7abec79ff68088d97ccc188613c733b4dfc8ede029cb818ec397f uclibc.patch +25847e75c681ad4f2f7d54844861de36556b44453c3febefda8e54b07839f442 musl-fixes.patch" sha512sums="4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b valgrind-3.9.0.tar.bz2 -d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch" +d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch +064a15689646b273171a6f8a7bedb3d58ab9258a6412b6ff021369b98d7b7cb26b3d0a9da49d4963d774b2656ccfea9238e9d5450e05064fa369680952d19e40 musl-fixes.patch" diff --git a/main/valgrind/musl-fixes.patch b/main/valgrind/musl-fixes.patch new file mode 100644 index 000000000..7a2c4ba34 --- /dev/null +++ b/main/valgrind/musl-fixes.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig 2014-04-03 05:54:36.931472516 +0000 ++++ ./configure.ac 2014-04-03 06:01:14.726289282 +0000 +@@ -931,8 +931,6 @@ + + *) + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17]) +- AC_MSG_ERROR([or Darwin libc]) + ;; + esac + diff --git a/main/valgrind/valgrind-3.4.0-uclibc.patch b/main/valgrind/valgrind-3.4.0-uclibc.patch deleted file mode 100644 index db6551996..000000000 --- a/main/valgrind/valgrind-3.4.0-uclibc.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- valgrind-3.4.0/drd/drd_pthread_intercepts.c.orig Thu Jan 22 14:37:52 2009 -+++ valgrind-3.4.0/drd/drd_pthread_intercepts.c Thu Jan 22 14:38:12 2009 -@@ -122,9 +122,6 @@ - /* PTHREAD_MUTEX_TIMED_NP */ - /* PTHREAD_MUTEX_NORMAL */ - case PTHREAD_MUTEX_DEFAULT: --#if defined(HAVE_PTHREAD_MUTEX_ADAPTIVE_NP) -- case PTHREAD_MUTEX_ADAPTIVE_NP: --#endif - return mutex_type_default_mutex; - } - return mutex_type_invalid_mutex; |