strace: update to version 5.5 (#3585)

commit:
  b494734 strace: fix configuration options
  ce8226a strace: Only allow libdw or libunwind
  b55fbb6 strace: update to version 4.26
  e669cf7 strace: Update to version 5.0
  9ba5cd8 strace: update to version 5.3
  b01305c strace: Fix build on PowerPC
  9a3b10b strace: update to version 5.4
  b55f68d strace: update to version 5.5
This commit is contained in:
coolsnowwolf 2020-03-05 22:07:41 +08:00 committed by GitHub
parent c3b411e8d8
commit 07c59d0cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 36 deletions

View File

@ -9,23 +9,25 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=strace PKG_NAME:=strace
PKG_VERSION:=4.25 PKG_VERSION:=5.5
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION)
PKG_HASH:=d685f8e65470b7832c3aff60c57ab4459f26ff89f07c10f92bd70ee89efac701 PKG_HASH:=9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff
PKG_LICENSE:=BSD-3c
PKG_LICENSE_FILES:=COPYRIGHT
PKG_CPE_ID:=cpe:/a:paul_kranenburg:strace
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:paul_kranenburg:strace
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_strace_libunwind
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_CONFIG_DEPENDS := \
CONFIG_STRACE_LIBDW \
CONFIG_STRACE_LIBUNWIND
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include
@ -44,27 +46,34 @@ define Package/strace
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=System call tracer TITLE:=System call tracer
DEPENDS:=+PACKAGE_strace_libunwind:libunwind URL:=https://strace.io/
URL:=http://strace.sourceforge.net/ DEPENDS:=+STRACE_LIBDW:libdw +STRACE_LIBUNWIND:libunwind
endef endef
define Package/strace/description define Package/strace/description
A useful diagnostic, instructional, and debugging tool. Allows you to track what A useful diagnostic, instructional, and debugging tool. Allows you to track what
system calls a program makes while it is running. system calls a program makes while it is running.
endef endef
define Package/strace/config define Package/strace/config
config PACKAGE_strace_libdw choice
bool "Enable stack tracing support using libdw" prompt "stack tracing support"
default n default STRACE_NONE
config PACKAGE_strace_libunwind
bool "Enable stack tracing support using libunwind (experimental)" config STRACE_NONE
default n bool "None"
config STRACE_LIBDW
bool "libdw"
config STRACE_LIBUNWIND
bool "libunwind (experimental)"
endchoice
endef endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-libdw=$(if $(CONFIG_PACKAGE_strace_libdw),yes,no) \ --with-libdw=$(if $(CONFIG_STRACE_LIBDW),yes,no) \
--with-libunwind=$(if $(CONFIG_PACKAGE_strace_libunwind),yes,no) --with-libunwind=$(if $(CONFIG_STRACE_LIBUNWIND),yes,no)
MAKE_FLAGS := \ MAKE_FLAGS := \
CCOPT="$(TARGET_CFLAGS)" CCOPT="$(TARGET_CFLAGS)"

View File

@ -1,17 +0,0 @@
--- a/ptrace.h
+++ b/ptrace.h
@@ -49,7 +49,14 @@
# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
#endif
+#if POWERPC
+#include <linux/types.h>
+#define __ASSEMBLY__
+#endif
#include <linux/ptrace.h>
+#if POWERPC
+#undef __ASSEMBLY__
+#endif
#ifdef HAVE_STRUCT_IA64_FPREG
# undef ia64_fpreg