diff --git a/packages/strace/build.sh b/packages/strace/build.sh index 6cba2d466..e9a14306f 100755 --- a/packages/strace/build.sh +++ b/packages/strace/build.sh @@ -1,11 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://strace.io/ TERMUX_PKG_DESCRIPTION="Debugging utility to monitor the system calls used by a program and all the signals it receives" -TERMUX_PKG_VERSION=4.20 -TERMUX_PKG_SHA256=5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523 -TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/project/strace/strace/${TERMUX_PKG_VERSION}/strace-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_VERSION=4.22 +TERMUX_PKG_SHA256=068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d +TERMUX_PKG_SRCURL=https://strace.io/files/$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script # Without st_cv_m32_mpers=no the build fails if gawk is installed. -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="st_cv_m32_mpers=no" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +st_cv_m32_mpers=no +--enable-mpers=no +" termux_step_pre_configure () { if [ $TERMUX_ARCH_BITS = "64" ]; then diff --git a/packages/strace/mtd.c.patch b/packages/strace/mtd.c.patch deleted file mode 100644 index a51c0f00a..000000000 --- a/packages/strace/mtd.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../strace-4.12/mtd.c ./mtd.c ---- ../strace-4.12/mtd.c 2016-05-28 15:16:32.000000000 -0400 -+++ ./mtd.c 2016-06-09 09:49:02.054555983 -0400 -@@ -32,7 +32,7 @@ - - /* The mtd api changes quickly, so we have to keep a local copy */ - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) -+#if 1 - # include "mtd-abi.h" - #else - # include diff --git a/packages/strace/ubi.c.patch b/packages/strace/ubi.c.patch deleted file mode 100644 index 83f7cab51..000000000 --- a/packages/strace/ubi.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../strace-4.12/ubi.c ./ubi.c ---- ../strace-4.12/ubi.c 2016-05-28 06:29:30.000000000 -0400 -+++ ./ubi.c 2016-06-09 09:56:41.495280471 -0400 -@@ -30,7 +30,7 @@ - - /* The UBI api changes, so we have to keep a local copy */ - #include --#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) || defined __ANDROID__ - # include "ubi-user.h" - #else - # include