From 220490ceae9d66f45ce0d1d79fee0a6403e3f4de Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Sat, 5 Apr 2014 14:51:02 +0200 Subject: [PATCH] perf: Fix compilation without libelf for post-3.10 kernels kernel commit cf4cca10 (perf tools: Move libelf check config into config/Makefile) removes the NO_LIBELF check from the top-level Makefile for newer kernels, if config/Makefile exists, we can assume that NO_LIBELF is also there Signed-off-by: Peter Meerwald Reviewed-by: Thomas De Schampheleire Tested-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- package/perf/perf.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/perf/perf.mk b/package/perf/perf.mk index d7898d0bc3..7610f3d1d6 100644 --- a/package/perf/perf.mk +++ b/package/perf/perf.mk @@ -36,9 +36,11 @@ define PERF_BUILD_CMDS fi $(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \ if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile ; then \ - echo "The perf tool in your kernel cannot be built without libelf." ; \ - echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \ - exit 1 ; \ + if ! test -r $(LINUX_DIR)/tools/perf/config/Makefile ; then \ + echo "The perf tool in your kernel cannot be built without libelf." ; \ + echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \ + exit 1 ; \ + fi \ fi \ fi $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/perf \ -- 2.30.2