From 315706dfada1c068aa690c4f8c0a23582c750674 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Feb 2014 15:46:40 +0000 Subject: [PATCH] linux-tools: Only use libunwind on x86, as perf needs additional porting work for other architectures (fixes FTBFS on arm and powerpc) svn path=/dists/sid/linux-tools/; revision=21024 --- debian/build/tools/perf/Makefile | 3 --- debian/changelog | 2 ++ debian/templates/control.source.in | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 5e6c511d6..ae35f6ce7 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -12,7 +12,6 @@ else ifeq ($(DEB_HOST_ARCH_CPU),amd64) 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) @@ -20,10 +19,8 @@ else ifeq ($(DEB_HOST_ARCH_CPU),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 2e236b592..c821350ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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) + * linux-tools: Only use libunwind on x86, as perf needs additional + porting work for other architectures (fixes FTBFS on arm and powerpc) -- Ben Hutchings Sun, 02 Feb 2014 16:14:33 +0100 diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index 0db2f3644..fdfa64c3c 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 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 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/