diff options
| author | Peter Meerwald <pmeerw@pmeerw.net> | 2014-04-05 14:51:02 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-05-05 21:53:19 +0200 |
| commit | 220490ceae9d66f45ce0d1d79fee0a6403e3f4de (patch) | |
| tree | a339baca7cf2b69bb318a8924482ab6516f314c1 | |
| parent | 687615cb587c77b041b03fa259ffaafd0763c5cd (diff) | |
| download | buildroot-220490ceae9d66f45ce0d1d79fee0a6403e3f4de.tar.gz buildroot-220490ceae9d66f45ce0d1d79fee0a6403e3f4de.zip | |
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 <pmeerw@pmeerw.net>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/perf/perf.mk | 8 |
1 files 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 \ |
