diff options
| -rw-r--r-- | package/devel/trace-cmd/Makefile | 4 | ||||
| -rw-r--r-- | package/devel/trace-cmd/patches/100-tracecmd-add-NO_LIBZSTD-option-to-disable-libzstd.patch | 38 |
2 files changed, 2 insertions, 40 deletions
diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile index 3f96d43b77..9e8c46bc6f 100644 --- a/package/devel/trace-cmd/Makefile +++ b/package/devel/trace-cmd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trace-cmd -PKG_VERSION:=v3.1.2 +PKG_VERSION:=v3.1.3 PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/ -PKG_HASH:=206672af60aa0bc35cfc44a4be746efa575bac729060e54b6453f7d5dfbcd979 +PKG_HASH:=1fd8515f38fc29fd7a66e7b6b5931856906522e8a1845999fc9033fc80d7b676 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING diff --git a/package/devel/trace-cmd/patches/100-tracecmd-add-NO_LIBZSTD-option-to-disable-libzstd.patch b/package/devel/trace-cmd/patches/100-tracecmd-add-NO_LIBZSTD-option-to-disable-libzstd.patch deleted file mode 100644 index 447e3b0790..0000000000 --- a/package/devel/trace-cmd/patches/100-tracecmd-add-NO_LIBZSTD-option-to-disable-libzstd.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4fcc23ee4291f445cada012b6bef6879274a25f1 Mon Sep 17 00:00:00 2001 -From: Nick Hainke <vincent@systemli.org> -Date: Sun, 7 Aug 2022 10:11:06 +0200 -Subject: [PATCH] tracecmd: add NO_LIBZSTD option to disable libzstd - -Other Linux kernel tools like perf already include options to disable -libzstd manually. Add this option also to trace-cmd. - -The OpenWrt SDK fails to build trace-cmd due to the autodetection of -libzstd. The package is present in some feed repositories but should -not be used by trace-cmd. The compilation will fail with: - - Package trace-cmd is missing dependencies for the following libraries: - libzstd.so.1 - -Signed-off-by: Nick Hainke <vincent@systemli.org> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -320,6 +320,7 @@ CFLAGS += -DHAVE_ZLIB - $(info Have zlib compression support) - endif - -+ifndef NO_LIBZSTD - TEST_LIBZSTD = $(shell sh -c "$(PKG_CONFIG) --atleast-version 1.4.0 libzstd > /dev/null 2>&1 && echo y") - - ifeq ("$(TEST_LIBZSTD)", "y") -@@ -335,6 +336,7 @@ $(info ******************************* - endif - - export LIBZSTD_CFLAGS LIBZSTD_LDLAGS ZSTD_INSTALLED -+endif - - CUNIT_INSTALLED := $(shell if (printf "$(pound)include <CUnit/Basic.h>\n void main(){CU_initialize_registry();}" | $(CC) -o /dev/null -x c - -lcunit >/dev/null 2>&1) ; then echo 1; else echo 0 ; fi) - export CUNIT_INSTALLED |