From a3f8abcc2a9a669237aafa95ac375541eb801575 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Feb 2014 15:41:21 +0000 Subject: [PATCH] linux-tools: Explicitly enable/disable libunwind usage for all architectures (fixes FTBFS on s390x and sparc) svn path=/dists/sid/linux-tools/; revision=21023 --- debian/build/tools/perf/Makefile | 6 ++++++ debian/changelog | 7 +++++++ debian/templates/control.source.in | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 45d8d2266..5e6c511d6 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -3,21 +3,27 @@ OUTDIR = tools/perf 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 + NO_LIBUNWIND= 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 + NO_LIBUNWIND= else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64) KERNEL_ARCH_PERF = powerpc + NO_LIBUNWIND= else ifeq ($(DEB_HOST_ARCH_CPU),s390) KERNEL_ARCH_PERF = s390 else ifeq ($(DEB_HOST_ARCH_CPU),s390x) diff --git a/debian/changelog b/debian/changelog index c4f1336a1..2e236b592 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-tools (3.12.6-3) UNRELEASED; urgency=medium + + * linux-tools: Explicitly enable/disable libunwind usage for all + architectures (fixes FTBFS on s390x and sparc) + + -- Ben Hutchings Sun, 02 Feb 2014 16:14:33 +0100 + linux-tools (3.12.6-2) unstable; urgency=medium * linux-tools: Replace build-dependency on libunwind7-dev with diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index c6ead8cdb..0db2f3644 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -6,7 +6,7 @@ Uploaders: Bastian Blank , Ben Hutchings Standards-Version: 3.9.4 Build-Depends: debhelper (>> 7), python, - asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64], libperl-dev, libunwind8-dev [amd64 armel armhf i386 mips powerpc ppc64], python-dev, xmlto, + asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64], libperl-dev, libunwind8-dev [amd64 armel armhf i386 powerpc ppc64], 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/