[kernel] r22319 - in dists/sid/linux-tools/debian: . build/tools/perf

[Ben Hutchings]

Author: benh
Date: Sat Jan 31 16:42:21 2015
New Revision: 22319

Log:
Revert "[armel,armhf] linux-tools: Enable use of libunwind"

I want to enable this, but (a) it doesn't work because I forgot to
change the build-dependency (b) it is not likely to be eligible for
a freeze exception.

Modified:
   dists/sid/linux-tools/debian/build/tools/perf/Makefile
   dists/sid/linux-tools/debian/changelog

Modified: dists/sid/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/sid/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 16:28:10 2015	(r22318)
+++ dists/sid/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 16:42:21 2015	(r22319)
@@ -3,11 +3,13 @@
 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),arm64)
@@ -16,6 +18,7 @@
   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)
@@ -34,7 +37,7 @@
   KERNEL_ARCH_PERF = sparc
 endif
 
-MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error
+MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
 
 # Disable Gtk UI until it's more usable
 MAKE_PERF += NO_GTK2=1

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Sat Jan 31 16:28:10 2015	(r22318)
+++ dists/sid/linux-tools/debian/changelog	Sat Jan 31 16:42:21 2015	(r22319)
@@ -3,7 +3,6 @@
   * linux-tools: Fix build configuration to avoid linking perf with libbfd
     (Closes: #763002)
   * linux-tools: Add a check that perf is not linked with libbfd
-  * [armel,armhf] linux-tools: Enable use of libunwind
   * [arm64] Enable building linux-tools, thanks to Steve Capper
     (Closes: #771340)