diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh index 22e1e34d9..70aa37e17 100644 --- a/packages/valgrind/build.sh +++ b/packages/valgrind/build.sh @@ -1,16 +1,10 @@ TERMUX_PKG_HOMEPAGE=http://valgrind.org/ TERMUX_PKG_DESCRIPTION="Instrumentation framework for building dynamic analysis tools" TERMUX_PKG_LICENSE="GPL-2.0" -TERMUX_PKG_VERSION=3.14.0 -TERMUX_PKG_SHA256=037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5 +TERMUX_PKG_VERSION=3.15.0 +TERMUX_PKG_SHA256=417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1 TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-tmpdir=$TERMUX_PREFIX/tmp" -# - Does not build on x86_64 due to lacking upstream support of that arch on android. -# https://bugs.kde.org/show_bug.cgi?id=348342 -# - Does not build on aarch64 using clang, fails with -# "`__builtin_longjmp is not supported for the current target" -# https://bugs.kde.org/show_bug.cgi?id=369723 -TERMUX_PKG_BLACKLISTED_ARCHES="x86_64" termux_step_pre_configure() { if [ "$TERMUX_ARCH" == "aarch64" ]; then diff --git a/packages/valgrind/coregrind-vgdb.c.patch b/packages/valgrind/coregrind-vgdb.c.patch new file mode 100644 index 000000000..368ff5ec8 --- /dev/null +++ b/packages/valgrind/coregrind-vgdb.c.patch @@ -0,0 +1,15 @@ +diff -u -r ../valgrind-3.15.0/coregrind/vgdb.c ./coregrind/vgdb.c +--- ../valgrind-3.15.0/coregrind/vgdb.c 2019-04-13 10:56:21.000000000 +0000 ++++ ./coregrind/vgdb.c 2019-04-17 21:03:04.737363007 +0000 +@@ -682,10 +682,7 @@ + sigpipe++; + } else if (signum == SIGALRM) { + sigalrm++; +-#if defined(VGPV_arm_linux_android) \ +- || defined(VGPV_x86_linux_android) \ +- || defined(VGPV_mips32_linux_android) \ +- || defined(VGPV_arm64_linux_android) ++#if defined(__ANDROID__) + /* Android has no pthread_cancel. As it also does not have + an invoker implementation, there is no need for cleanup action. + So, we just do nothing. */