tools build: Add test for presence of numa_num_possible_cpus() in libnuma
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: f8ac8606fd3cd72183de8eec2b151ff05040c70f Gitweb: http://git.kernel.org/tip/f8ac8606fd3cd72183de8eec2b151ff05040c70f Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 17 Sep 2015 12:20:28 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 17 Sep 2015 13:14:35 -0300
tools build: Add test for presence of numa_num_possible_cpus() in libnuma
The existing numa test checks only if numa.h and numa_available() are present, but that can be satisfied with an old libnuma that is not enough for the 'perf bench numa' entry, so add a test to check for that:
[acme@rhel5 linux]$ make NO_AUXTRACE=1 NO_LIBPERL=1 -C tools/perf O=/tmp/build/perf install-bin
make: Entering directory `/home/acme/git/linux/tools/perf'
BUILD: Doing 'make -j2' parallel build
Auto-detecting system features:
... libelf: [ on ]
... libnuma: [ on ]
... numa_num_possible_cpus: [ OFF ]
... libperl: [ on ]
<SNIP>
config/Makefile:577: Old numa library found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev >= 2.0.8
INSTALL binaries
<SNIP>
This fixes the build on old systems such as RHEL/CentOS 5.11.
--- tools/build/Makefile.feature | 2 ++ tools/build/feature/Makefile | 4 ++++ tools/build/feature/test-all.c | 5 +++++ tools/build/feature/test-numa_num_possible_cpus.c | 6 ++++++ tools/perf/config/Makefile | 11 ++++++++--- 5 files changed, 25 insertions(+), 3 deletions(-)
tools/build/Makefile.feature +2 -0
@@ -41,6 +41,7 @@ FEATURE_TESTS ?= \ libelf-getphdrnum \ libelf-mmap \ libnuma \ + numa_num_possible_cpus \ libperl \ libpython \ libpython-version \
@@ -61,6 +62,7 @@ FEATURE_DISPLAY ?= \ libbfd \ libelf \ libnuma \ + numa_num_possible_cpus \ libperl \ libpython \ libslang \
tools/build/feature/Makefile +4 -0
@@ -19,6 +19,7 @@ FILES= \ test-libelf-getphdrnum.bin \ test-libelf-mmap.bin \ test-libnuma.bin \ + test-numa_num_possible_cpus.bin \ test-libperl.bin \ test-libpython.bin \ test-libpython-version.bin \
@@ -87,6 +88,9 @@ test-libelf-getphdrnum.bin: test-libnuma.bin: $(BUILD) -lnuma +test-numa_num_possible_cpus.bin: + $(BUILD) -lnuma + test-libunwind.bin: $(BUILD) -lelf
tools/build/feature/test-all.c +5 -0
@@ -77,6 +77,10 @@# include "test-libnuma.c" #undef main +#define main main_test_numa_num_possible_cpus +# include "test-numa_num_possible_cpus.c" +#undef main +#define main main_test_timerfd# include "test-timerfd.c" #undef main
@@ -136,6 +140,7 @@ int main(int argc, char *argv[])main_test_libbfd ();main_test_backtrace ();main_test_libnuma (); +main_test_numa_num_possible_cpus ();main_test_timerfd ();main_test_stackprotector_all ();main_test_libdw_dwarf_unwind ();
tools/build/feature/test-numa_num_possible_cpus.c new file +6 -0
@@ -0,0 +1,6 @@ +#include <numa.h> + +int main (void ) +{ +return numa_num_possible_cpus (); +}
tools/perf/config/Makefile +8 -3
@@ -573,9 +573,14 @@ ifndef NO_LIBNUMA msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev); NO_LIBNUMA := 1 else - CFLAGS += -DHAVE_LIBNUMA_SUPPORT - EXTLIBS += -lnuma - $(call detected,CONFIG_NUMA) + ifeq ($(feature-numa_num_possible_cpus), 0) + msg := $(warning Old numa library found, disables 'perf bench numa mem' benchmark, please install numactl-devel/libnuma-devel/libnuma-dev >= 2.0.8); + NO_LIBNUMA := 1 + else + CFLAGS += -DHAVE_LIBNUMA_SUPPORT + EXTLIBS += -lnuma + $(call detected,CONFIG_NUMA) + endif endif endif