X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5a15b12e4b9c89b7efdf203677380ab4effd8716..7c5fa0b8a793c371fcb0793ed1b9bfe581d7e7b3:/packages/valgrind/build.sh

diff --git a/packages/valgrind/build.sh b/packages/valgrind/build.sh
index 3a9e24a6..bc7db12b 100644
--- a/packages/valgrind/build.sh
+++ b/packages/valgrind/build.sh
@@ -1,15 +1,22 @@
 TERMUX_PKG_HOMEPAGE=http://valgrind.org/
 TERMUX_PKG_DESCRIPTION="Valgrind is an instrumentation framework for building dynamic analysis tools."
-TERMUX_PKG_VERSION=3.11.0
-TERMUX_PKG_SRCURL=http://valgrind.org/downloads/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
-# TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_VERSION=3.13.0
+TERMUX_PKG_SRCURL=ftp://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-tmpdir=$TERMUX_PREFIX/tmp"
-# - Does not build on arm due to https://github.com/android-ndk/ndk/issues/132 (fixed in ndk r13)
 # - Does not build on x86_64 due to lacking upstream support of that arch on android.
-TERMUX_PKG_BLACKLISTED_ARCHES="arm, x86_64"
-
-if [ "$TERMUX_ARCH" == "arm" ]; then
-  # valgrind doesn't like arm; armv7 works, though.
-  TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
-fi
+#   See https://bugs.kde.org/show_bug.cgi?id=348342
+TERMUX_PKG_BLACKLISTED_ARCHES="x86_64"
+# With a clang build on aarch64:
+# "error: the clang compiler does not support '-mcpu=cortex-a8'":
+TERMUX_PKG_CLANG=no
 
+termux_step_pre_configure() {
+	if [ "$TERMUX_ARCH" == "arm" ]; then
+		# valgrind doesn't like arm; armv7 works, though.
+		TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=armv7-linux-androideabi"
+		# http://lists.busybox.net/pipermail/buildroot/2013-November/082270.html:
+		# "valgrind uses inline assembly that is not Thumb compatible":
+		CFLAGS=${CFLAGS/-mthumb/}
+	fi
+}