diff options
| -rw-r--r-- | package/strace/Config.in | 2 | ||||
| -rw-r--r-- | package/strace/strace-fix-arm-bad-syscall.patch | 18 | ||||
| -rw-r--r-- | package/strace/strace-fix-disabled-largefile-syscalls.patch | 6 | ||||
| -rw-r--r-- | package/strace/strace.mk | 9 |
4 files changed, 5 insertions, 30 deletions
diff --git a/package/strace/Config.in b/package/strace/Config.in index 153bcf69a..0959ec535 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_STRACE bool "strace" - depends on !(BR2_xtensa || BR2_aarch64 || BR2_arc) + depends on !BR2_arc help A useful diagnostic, instructional, and debugging tool. Allows you to track what system calls a program makes diff --git a/package/strace/strace-fix-arm-bad-syscall.patch b/package/strace/strace-fix-arm-bad-syscall.patch deleted file mode 100644 index 3f3144e92..000000000 --- a/package/strace/strace-fix-arm-bad-syscall.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/syscall.c -+++ b/syscall.c -@@ -1016,6 +1016,15 @@ struct tcb *tcp; - /* - * Note: we only deal with only 32-bit CPUs here. - */ -+ -+ if (!(tcp->flags & TCB_INSYSCALL) && -+ (tcp->flags & TCB_WAITEXECVE)) { -+ /* caught a fake syscall from the execve's exit */ -+ tcp->flags &= ~TCB_WAITEXECVE; -+ return 0; -+ } -+ -+ - if (regs.ARM_cpsr & 0x20) { - /* - * Get the Thumb-mode system call number diff --git a/package/strace/strace-fix-disabled-largefile-syscalls.patch b/package/strace/strace-fix-disabled-largefile-syscalls.patch index f6bcf96cf..2117a0e40 100644 --- a/package/strace/strace-fix-disabled-largefile-syscalls.patch +++ b/package/strace/strace-fix-disabled-largefile-syscalls.patch @@ -1,8 +1,8 @@ --- a/syscall.c +++ b/syscall.c @@ -125,6 +125,18 @@ - #define TP TRACE_PROCESS - #define TS TRACE_SIGNAL + #define NF SYSCALL_NEVER_FAILS + #define MA MAX_ARGS +#ifndef HAVE_STATFS64 +/* @@ -16,6 +16,6 @@ +#define sys_fstatfs64 sys_fstatfs +#endif + - static const struct sysent sysent0[] = { + const struct_sysent sysent0[] = { #include "syscallent.h" }; diff --git a/package/strace/strace.mk b/package/strace/strace.mk index b172a2005..0dce09672 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 4.7 +STRACE_VERSION = 4.8 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) STRACE_LICENSE = BSD-3c @@ -13,13 +13,6 @@ STRACE_LICENSE_FILES = COPYRIGHT STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \ ac_cv_header_linux_netlink_h=yes -ifeq ($(BR2_LARGEFILE),y) -# strace gets confused when lfs mode is forced, so don't -STRACE_CONF_ENV += \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" -endif - define STRACE_REMOVE_STRACE_GRAPH rm -f $(TARGET_DIR)/usr/bin/strace-graph endef |