From patchwork Sat Apr 5 12:51:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Meerwald-Stadler X-Patchwork-Id: 337161 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id A42AC1400F2 for ; Sat, 5 Apr 2014 23:59:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A1314893C1; Sat, 5 Apr 2014 12:59:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YSSSpHkF6TPg; Sat, 5 Apr 2014 12:59:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 67349883E4; Sat, 5 Apr 2014 12:59:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E40211BF869 for ; Sat, 5 Apr 2014 12:59:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DDE1E8B275 for ; Sat, 5 Apr 2014 12:59:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lAMviyFhjgIU for ; Sat, 5 Apr 2014 12:59:27 +0000 (UTC) X-Greylist: delayed 00:08:19 by SQLgrey-1.7.6 Received: from pmeerw.net (ns.pmeerw.net [87.118.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id E937B8A99D for ; Sat, 5 Apr 2014 12:59:26 +0000 (UTC) Received: from localhost.localdomain (83-215-0-241.stadt.dyn.salzburg-online.at [83.215.0.241]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: pmeerw) by pmeerw.net (Postfix) with ESMTPSA id CE763C50001; Sat, 5 Apr 2014 14:51:04 +0200 (CEST) From: Peter Meerwald To: buildroot@busybox.net Date: Sat, 5 Apr 2014 14:51:02 +0200 Message-Id: <1396702262-26514-1-git-send-email-pmeerw@pmeerw.net> X-Mailer: git-send-email 1.9.1 Cc: Peter Meerwald Subject: [Buildroot] [PATCH] perf: Fix compilation without libelf for post-3.10 kernels X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- 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 d7898d0..7610f3d 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 \