The Linux kernel Commit 44b44ffd5dce ("perf build: Minor improvement for
linking libzstd") adds a test if libzstd is installed and uses this as
heuristic if libelf is build with zstd support. Thus, if zstd is
installed, perf cannot be built without zstd support anymore.

Always build perf with zstd support and make sure that libelf is built
with zstd, too.

Signed-off-by: Michael Tretter <[email protected]>
---
 rules/kernel.in   | 1 +
 rules/kernel.make | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/kernel.in b/rules/kernel.in
index 46c2267b6df3..488b08e25016 100644
--- a/rules/kernel.in
+++ b/rules/kernel.in
@@ -3,6 +3,7 @@
 menuconfig KERNEL
        bool "kernel tools                  "
        select LIBELF                   if KERNEL_TOOL_PERF
+       select LIBELF_ZSTD              if KERNEL_TOOL_PERF
        select LIBELF_LIBDW             if KERNEL_TOOL_PERF
        select SLANG                    if KERNEL_TOOL_PERF
        select BINUTILS                 if KERNEL_TOOL_PERF
diff --git a/rules/kernel.make b/rules/kernel.make
index f38661301d91..19b05811def2 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -229,7 +229,7 @@ KERNEL_TOOL_PERF_OPTS       := \
        NO_ZLIB= \
        NO_LIBBABELTRACE=1 \
        NO_LZMA=1 \
-       NO_LIBZSTD=1 \
+       NO_LIBZSTD= \
        NO_AUXTRACE= \
        NO_LIBBPF=1 \
        NO_SDT=1 \
-- 
2.39.5


Reply via email to