diff mbox

[Natty,Maverick,Lucid,SRU] perf: Fix libbfd usage

Message ID 4E4BF0BD.20006@canonical.com
State New
Headers show

Commit Message

Stefan Bader Aug. 17, 2011, 4:47 p.m. UTC 
... here.

Comments

Stefan Bader Aug. 17, 2011, 4:49 p.m. UTC | #1 
On 17.08.2011 18:47, Stefan Bader wrote:
> ... here.
> 
of course I should have changed the subject... Doh!
Tim Gardner Aug. 18, 2011, 12:09 p.m. UTC | #2 
On 08/17/2011 10:49 AM, Stefan Bader wrote:
> On 17.08.2011 18:47, Stefan Bader wrote:
>> ... here.
>>
> of course I should have changed the subject... Doh!
>
diff mbox

Patch

From 5d81fac867ee76e766ce57919f9479cf94282c13 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
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 <stefan.bader@canonical.com>
---
 debian/rules.d/2-binary-arch.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index ace4d85..a2e8016 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -347,7 +347,7 @@  endif
 
 $(stampdir)/stamp-build-perarch: prepare-perarch
 ifeq ($(do_tools),true)
-	cd $(builddir)/tools-$*/tools/perf && make
+	cd $(builddir)/tools-$*/tools/perf && make HAVE_CPLUS_DEMANGLE=1
 endif
 	@touch $@
 
-- 
1.7.4.1