[linux-tools] 10/11: Revert "perf build: Fix libunwind feature detection on 32-bit x86"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux-tools.

commit e966731fa07da3ba824cb57d5fc9e503e400f547
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Sep 25 22:55:24 2015 +0100

    Revert "perf build: Fix libunwind feature detection on 32-bit x86"
---
 debian/changelog                                   |  2 ++
 ...-build-fix-libunwind-feature-detection-on.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c0541de..85ff92a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ linux-tools (4.2-1) UNRELEASED; urgency=medium
   * hyperv-daemons: Fix fortify format warning
   * debian/rules: Add support for DEB_BUILD_OPTIONS=parallel=N
   * debian/control: Update policy version to 3.9.6; no changes required
+  * linux-perf: Revert "perf build: Fix libunwind feature detection on 32-bit
+    x86", which was a regression for us
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 25 Sep 2015 18:42:20 +0100
 
diff --git a/debian/patches/revert-perf-build-fix-libunwind-feature-detection-on.patch b/debian/patches/revert-perf-build-fix-libunwind-feature-detection-on.patch
new file mode 100644
index 0000000..6787fa2
--- /dev/null
+++ b/debian/patches/revert-perf-build-fix-libunwind-feature-detection-on.patch
@@ -0,0 +1,23 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 25 Sep 2015 22:50:50 +0100
+Subject: Revert "perf build: Fix libunwind feature detection on 32-bit x86"
+
+This reverts commit 05b41775e2edd69a83f592e3534930c934d4038e.
+It broke feature detection that was working just fine for us.
+---
+ tools/perf/config/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
+index 094ddae..9b8937c 100644
+--- a/tools/perf/config/Makefile
++++ b/tools/perf/config/Makefile
+@@ -32,7 +32,7 @@ ifeq ($(ARCH),x86)
+     LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
+     $(call detected,CONFIG_X86_64)
+   else
+-    LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind
++    LIBUNWIND_LIBS = -lunwind -lunwind-x86
+   endif
+   NO_PERF_REGS := 0
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index f8ec6ae..97b2e64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ tools-perf-remove-shebangs.patch
 tools-lib-traceevent-use-ldflags.patch
 tools-lib-lockdep-use-ldflags.patch
 tools-hv-fix-fortify-format-warning.patch
+revert-perf-build-fix-libunwind-feature-detection-on.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git