|
|
@@ -0,0 +1,38 @@
|
|
|
+From 4fcc23ee4291f445cada012b6bef6879274a25f1 Mon Sep 17 00:00:00 2001
|
|
|
+From: Nick Hainke <[email protected]>
|
|
|
+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 <[email protected]>
|
|
|
+---
|
|
|
+ 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
|