Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools build: Don't set libunwind as available if test-all.c build succeeds

The tools/build/feature/test-all.c file tries to detect the expected,
most common set of libraries/features we expect to have available to
build perf with.

At some point libunwind was deemed not to be part of that set of
libries, but the patches making it to be opt-in ended up forgetting some
details, fix one more.

Testing it:

$ rm -rf /tmp/build/$(basename $PWD)/ ; mkdir -p /tmp/build/$(basename $PWD)/
$ rpm -q libunwind-devel
libunwind-devel-1.8.0-3.fc40.x86_64
$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind
... libunwind: [ on ]
CC /tmp/build/perf-tools-next/arch/x86/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/arch/x86/util/unwind-libunwind.o
CC /tmp/build/perf-tools-next/util/arm64-frame-pointer-unwind-support.o
CC /tmp/build/perf-tools-next/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/util/unwind-libunwind-local.o
CC /tmp/build/perf-tools-next/util/unwind-libunwind.o
libunwind-x86_64.so.8 => /lib64/libunwind-x86_64.so.8 (0x00007f615a549000)
libunwind.so.8 => /lib64/libunwind.so.8 (0x00007f615a52f000)
$ sudo rpm -e libunwind-devel
$ rm -rf /tmp/build/$(basename $PWD)/ ; mkdir -p /tmp/build/$(basename $PWD)/
$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind
Makefile.config:653: No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR
... libunwind: [ OFF ]
CC /tmp/build/perf-tools-next/arch/x86/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/arch/x86/util/unwind-libdw.o
CC /tmp/build/perf-tools-next/util/arm64-frame-pointer-unwind-support.o
CC /tmp/build/perf-tools-next/tests/dwarf-unwind.o
CC /tmp/build/perf-tools-next/util/unwind-libdw.o
$

Should be in a separate patch, but tired now, so also adding a message
about the need to use LIBUNWIND=1 in the output when its not available,
so done here as well.

So, now when the devel files are not available we get:

$ make -k LIBUNWIND=1 CORESIGHT=1 O=/tmp/build/$(basename $PWD)/ -C tools/perf install-bin |& grep unwind && ldd ~/bin/perf | grep unwind
Makefile.config:653: No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR and set LIBUNWIND=1 in the make command line as it is opt-in now
... libunwind: [ OFF ]
$

Fixes: 13e17c9ff49119aa ("perf build: Make libunwind opt-in rather than opt-out")
Reported-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/Z_AnsW9oJzFbhIFC@x1
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+3 -2
-1
tools/build/Makefile.feature
··· 87 87 libtracefs \ 88 88 libcpupower \ 89 89 libcrypto \ 90 - libunwind \ 91 90 pthread-attr-setaffinity-np \ 92 91 pthread-barrier \ 93 92 reallocarray \
+3 -1
tools/perf/Makefile.config
··· 624 624 ifndef NO_LIBUNWIND 625 625 have_libunwind := 626 626 627 + $(call feature_check,libunwind) 628 + 627 629 $(call feature_check,libunwind-x86) 628 630 ifeq ($(feature-libunwind-x86), 1) 629 631 $(call detected,CONFIG_LIBUNWIND_X86) ··· 650 648 endif 651 649 652 650 ifneq ($(feature-libunwind), 1) 653 - $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR) 651 + $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR and set LIBUNWIND=1 in the make command line as it is opt-in now) 654 652 NO_LOCAL_LIBUNWIND := 1 655 653 else 656 654 have_libunwind := 1