diff mbox

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

Message ID 4E4BF0A1.4040201@canonical.com
State New
Headers show

Commit Message

Stefan Bader Aug. 17, 2011, 4:47 p.m. UTC 
Applies to both Natty and Maverick, Lucid to follow...

Comments

Tim Gardner Aug. 18, 2011, 12:13 p.m. UTC | #1 
On 08/17/2011 10:47 AM, Stefan Bader wrote:
> Applies to both Natty and Maverick, Lucid to follow...
>
>
diff mbox

Patch

From de47e7346bc372ece46ec11e1fdfb6ebd1407e84 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 |    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