sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strace: Update from 4.22 to 4.23

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-07-11 10:35:45 +02:00
parent 517dc09dff
commit 9285c5f227
4 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/strace/build.sh
View File

@ -1,7 +1,7 @@
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.22
TERMUX_PKG_SHA256=068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d
TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals received"
TERMUX_PKG_VERSION=4.23
TERMUX_PKG_SHA256=7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad
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.
@ -9,14 +9,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
st_cv_m32_mpers=no
--enable-mpers=no
"
termux_step_pre_configure () {
if [ $TERMUX_ARCH_BITS = "64" ]; then
# The strace configure script only looks for struct flock64 in <linux/fcntl.h>,
# but we actually have it in <fcntl.h> here:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_type_struct_flock64=yes"
fi
CFLAGS+=" -DIOV_MAX=1024"
}

14
packages/strace/defs.h.patch
View File

@ -1,14 +0,0 @@
diff -u -r ../strace-4.10/defs.h ./defs.h
--- ../strace-4.10/defs.h 2015-03-05 21:19:01.000000000 -0500
+++ ./defs.h 2015-05-24 18:53:25.580567401 -0400
@@ -55,6 +55,10 @@
#include <sys/time.h>
#include <sys/syscall.h>
+#ifdef __ANDROID__
+# include <linux/stat.h> /* For S_IFMT, S_ISUID and S_ISGID defines. */
+#endif
+
#ifndef HAVE_STRERROR
const char *strerror(int);
mendif

11
packages/strace/fcntl.h.patch
View File

@ -1,11 +0,0 @@
diff -u -r ../strace-4.11/flock.h ./flock.h
--- ../strace-4.11/flock.h 2015-12-17 12:56:48.000000000 -0500
+++ ./flock.h 2016-01-03 20:51:51.276893007 -0500
@@ -26,6 +26,7 @@
*/
#include <linux/fcntl.h>
+#include <fcntl.h>
#if defined HAVE_STRUCT_FLOCK
typedef struct flock struct_kernel_flock;

17
packages/strace/linux-linux-signal.h.patch Normal file
View File

@ -0,0 +1,17 @@
diff -u -r ../strace-4.23/linux/linux/signal.h ./linux/linux/signal.h
--- ../strace-4.23/linux/linux/signal.h 2018-06-13 18:18:38.000000000 +0200
+++ ./linux/linux/signal.h 2018-07-09 23:12:56.526822310 +0200
@@ -1,5 +1,13 @@
+#include <sys/cdefs.h>
+#if defined(__BIONIC__)
+/*
+ * Bionic's <linux/signal.h> is the UAPI one, and <signal.h> requires it.
+ */
+#include_next <linux/signal.h>
+#else
/*
* Workaround the infamous incompatibility between <linux/signal.h>
* and many libc headers by overriding <linux/signal.h> with <signal.h>.
*/
#include <signal.h>
+#endif