debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Avoid building with libunwind8-dev 

The transition from libunwind soversion 7 to 8 is blocked and will
likely remain blocked for some time because libunwind7 is linked into
all ia64 binaries.

For amd64 and i386, downgrade the build-dependency to libunwind7-dev.

For architectures that are supported by libunwind8-dev, remove the
build-dependency and ensure we don't accidentally link with libunwind8
by setting NO_LIBUNWIND=1 when building perf.

svn path=/dists/sid/linux-tools/; revision=20755
This commit is contained in:
Ben Hutchings 2013-10-29 03:41:10 +00:00
parent 99504223d7
commit f2655a84c9
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/build/tools/perf/Makefile vendored
View File

@ -4,16 +4,20 @@ include ../../Makefile.inc
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
NO_LIBUNWIND = 1
ifeq ($(DEB_HOST_ARCH_CPU),alpha)
KERNEL_ARCH_PERF = alpha
else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
KERNEL_ARCH_PERF = x86_64
NO_LIBUNWIND =
else ifeq ($(DEB_HOST_ARCH_CPU),arm)
KERNEL_ARCH_PERF = arm
else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
KERNEL_ARCH_PERF = parisc
else ifeq ($(DEB_HOST_ARCH_CPU),i386)
KERNEL_ARCH_PERF = i386
NO_LIBUNWIND =
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
KERNEL_ARCH_PERF = powerpc
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
@ -31,7 +35,9 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sparc64)
endif
# disable Gtk UI until it's more usable
MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=1 NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error
# disable libunwind on architectures lacking libunwind7-dev, just in case
# libunwind8-dev is installed
MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=1 NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
all:
ifdef KERNEL_ARCH_PERF

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
linux-tools (3.11-3) unstable; urgency=low
* linux-tools: Replace build-dependency on libunwind8-dev with
libunwind7-dev, as the new libunwind will not enter testing soon
-- Ben Hutchings <ben@decadent.org.uk> Tue, 29 Oct 2013 02:12:36 +0000
linux-tools (3.11-2) unstable; urgency=low
* linux-tools: Limit build-dependency on libunwind8-dev to architectures

2
debian/templates/control.source.in vendored
View File

@ -6,7 +6,7 @@ Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>
Standards-Version: 3.9.4
Build-Depends:
debhelper (>> 7), python,
asciidoc, binutils-dev, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, libunwind8-dev [amd64 armel armhf i386 mips powerpc ppc64], python-dev, xmlto,
asciidoc, binutils-dev, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, libunwind7-dev [amd64 i386], python-dev, xmlto,
autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/