Explicitly deactivate libselinux, otherwise we get a hard dependency to
libselinux.

Signed-off-by: Hauke Mehrtens <[email protected]>
---
 package/devel/strace/Makefile             | 9 +++++----
 package/devel/strace/patches/010-m4.patch | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index 8c4a26b63b25..527b3e01d83e 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=strace
-PKG_VERSION:=5.10
-PKG_RELEASE:=2
+PKG_VERSION:=5.14
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION)
-PKG_HASH:=fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c
+PKG_HASH:=901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73
 
 PKG_MAINTAINER:=Felix Fietkau <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -70,7 +70,8 @@ endef
 CONFIGURE_ARGS += \
        --with-libdw=$(if $(CONFIG_STRACE_LIBDW),yes,no) \
        --with-libunwind=$(if $(CONFIG_STRACE_LIBUNWIND),yes,no) \
-       --enable-mpers=no
+       --enable-mpers=no \
+       --without-libselinux
 
 MAKE_FLAGS := \
        CCOPT="$(TARGET_CFLAGS)"
diff --git a/package/devel/strace/patches/010-m4.patch 
b/package/devel/strace/patches/010-m4.patch
index 478961ce26e4..32584e11806f 100644
--- a/package/devel/strace/patches/010-m4.patch
+++ b/package/devel/strace/patches/010-m4.patch
@@ -1,10 +1,10 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -408,7 +408,6 @@ strace_LDADD += $(libiberty_LIBS)
- endif
- endif
+@@ -21,7 +21,6 @@ man_MANS = doc/strace.1 doc/strace-log-m
+ 
+ ACLOCAL_AMFLAGS = -I m4 -I src/xlat
  
 -@CODE_COVERAGE_RULES@
  CODE_COVERAGE_BRANCH_COVERAGE = 1
  CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \
-       --prefix $(shell cd $(abs_top_srcdir)/.. && pwd || echo .)
+       --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \
-- 
2.30.2


_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to