From patchwork Wed Aug 17 16:47:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 110339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id D07C3B6F9F for ; Thu, 18 Aug 2011 02:47:43 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QtjHC-0002EP-Q0; Wed, 17 Aug 2011 16:47:34 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QtjH9-0002EJ-Lb for kernel-team@lists.ubuntu.com; Wed, 17 Aug 2011 16:47:31 +0000 Received: from p5b2e57ea.dip.t-dialin.net ([91.46.87.234] helo=[192.168.2.5]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QtjH9-0008C4-Ik for kernel-team@lists.ubuntu.com; Wed, 17 Aug 2011 16:47:31 +0000 Message-ID: <4E4BF0A1.4040201@canonical.com> Date: Wed, 17 Aug 2011 18:47:29 +0200 From: Stefan Bader User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110617 Lightning/1.0b2 Thunderbird/3.1.11 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: [Natty, Maverick SRU] perf: Fix libbfd usage References: <1313587473-7699-1-git-send-email-stefan.bader@canonical.com> <4E4BF02B.60406@canonical.com> In-Reply-To: <4E4BF02B.60406@canonical.com> X-Enigmail-Version: 1.1.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Applies to both Natty and Maverick, Lucid to follow... From de47e7346bc372ece46ec11e1fdfb6ebd1407e84 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Tue, 16 Aug 2011 16:14:22 +0200 Subject: [PATCH] UBUNTU: (build) Force perf to use libiberty for demangling Because libbfd is GPLv3 only and perf is GPLv2 only. Also this avoids statically linking against libbfd to allow multiple versions of perf being installed in parallel. See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606050 BugLink: http://bugs.launchpad.net/bugs/783660 Signed-off-by: Stefan Bader --- debian/rules.d/2-binary-arch.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index cf112cd..876a980 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -365,7 +365,8 @@ endif $(stampdir)/stamp-build-perarch: prepare-perarch ifeq ($(do_tools),true) - cd $(builddir)/tools-$*/tools/perf && make $(CROSS_COMPILE) + cd $(builddir)/tools-$*/tools/perf && \ + make HAVE_CPLUS_DEMANGLE=1 $(CROSS_COMPILE) endif @touch $@ -- 1.7.4.1