[kernel] r22323 - dists/trunk/linux-tools/debian/build/tools/perf

Ben Hutchings benh at moszumanska.debian.org
Sat Jan 31 23:14:36 UTC 2015


Author: benh
Date: Sat Jan 31 23:14:36 2015
New Revision: 22323

Log:
linux-tools: Remove explicit NO_LIBUNWIND

In 3.12.6-3 we explicitly disabled use of libunwind on most
architectures because perf requires its own architecture-specific code
on top of libunwind yet it would attempt to build with libunwind
wherever libunwind8-dev was installed.

This was fixed in perf 3.15 so we can remove this workaround.

Modified:
   dists/trunk/linux-tools/debian/build/tools/perf/Makefile

Modified: dists/trunk/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 23:09:41 2015	(r22322)
+++ dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 23:14:36 2015	(r22323)
@@ -3,23 +3,19 @@
 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)
   KERNEL_ARCH_PERF = arm64
-  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
 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
@@ -38,7 +34,7 @@
   KERNEL_ARCH_PERF = sparc
 endif
 
-MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
+MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error
 
 # Disable Gtk UI until it's more usable
 MAKE_PERF += NO_GTK2=1



More information about the Kernel-svn-changes mailing list