From patchwork Wed May 8 13:24:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1097026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44zcdv3w34z9s5c; Wed, 8 May 2019 23:24:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hOMYs-00077j-4r; Wed, 08 May 2019 13:24:42 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hOMYq-00077Y-VT for kernel-team@lists.ubuntu.com; Wed, 08 May 2019 13:24:40 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hOMYq-0002hR-IZ; Wed, 08 May 2019 13:24:40 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [SRU disco/master-next 1/1] UBUNTU: SAUCE: tools -- fix add ability to disable libbfd Date: Wed, 8 May 2019 14:24:40 +0100 Message-Id: <20190508132440.7388-1-apw@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd feature test to -liberty and -lz") the enablement code changed radically neutering our override. Adapt to that new form. Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") Signed-off-by: Andy Whitcroft Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- tools/perf/Makefile.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index ecdd0e8c5e6d..67848a73a661 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -702,7 +702,8 @@ endif ifdef HAVE_NO_LIBBFD feature-libbfd := 0 -endif + $(info libbfd overidden OFF) +else ifeq ($(feature-libbfd), 1) EXTLIBS += -lbfd @@ -724,6 +725,8 @@ else endif endif +endif + ifdef NO_DEMANGLE CFLAGS += -DNO_DEMANGLE else