[kernel] r21888 - in dists/wheezy-backports/linux-tools/debian: . patches

[Ben Hutchings]

Author: benh
Date: Sun Sep 21 18:22:11 2014
New Revision: 21888

Log:
perf: Work-around Perl bool definition conflict

Added:
   dists/wheezy-backports/linux-tools/debian/patches/perf-workaround-perl-bool-definition-conflict.patch
Modified:
   dists/wheezy-backports/linux-tools/debian/changelog
   dists/wheezy-backports/linux-tools/debian/patches/series

Modified: dists/wheezy-backports/linux-tools/debian/changelog
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/changelog	Sun Sep 21 17:57:00 2014	(r21887)
+++ dists/wheezy-backports/linux-tools/debian/changelog	Sun Sep 21 18:22:11 2014	(r21888)
@@ -2,8 +2,9 @@
 
   * Rebuild for wheezy
     - Replace build-dependency on libunwind8-dev with libunwind7-dev
+    - perf: Work-around Perl bool definition conflict
 
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 21 Sep 2014 16:24:30 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 21 Sep 2014 19:22:08 +0100
 
 linux-tools (3.16-2) unstable; urgency=medium
 

Added: dists/wheezy-backports/linux-tools/debian/patches/perf-workaround-perl-bool-definition-conflict.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy-backports/linux-tools/debian/patches/perf-workaround-perl-bool-definition-conflict.patch	Sun Sep 21 18:22:11 2014	(r21888)
@@ -0,0 +1,33 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 21 Sep 2014 19:06:45 +0100
+Subject: perf: Work-around Perl bool definition conflict
+
+In older Perl versions (at least 5.14 in 'wheezy') the XS headers will
+define the bool type directly rather than including <stdbool.h>.  This
+now conflicts with indirect inclusion of <stdbool.h> by other headers.
+There is an attempted workaround for this in the upstream source but
+it doesn't seem to be applied early enough any more.  Move it to the
+compiler options for the Perl binding.
+
+--- a/tools/perf/config/Makefile
++++ b/tools/perf/config/Makefile
+@@ -446,6 +446,9 @@ else
+   PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
+   PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
+   PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
++  # Older versions of Perl will try to define bool, in conflict with
++  # <stdbool.h>
++  PERL_EMBED_CCOPTS += -include stdbool.h -DHAS_BOOL
+   FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
+ 
+   ifneq ($(feature-libperl), 1)
+--- a/tools/perf/util/util.h
++++ b/tools/perf/util/util.h
+@@ -39,7 +39,6 @@
+ 
+ #define _ALL_SOURCE 1
+ #define _BSD_SOURCE 1
+-#define HAS_BOOL
+ 
+ #include <unistd.h>
+ #include <stdio.h>

Modified: dists/wheezy-backports/linux-tools/debian/patches/series
==============================================================================
--- dists/wheezy-backports/linux-tools/debian/patches/series	Sun Sep 21 17:57:00 2014	(r21887)
+++ dists/wheezy-backports/linux-tools/debian/patches/series	Sun Sep 21 18:22:11 2014	(r21888)
@@ -3,3 +3,4 @@
 tools-perf-install.patch
 usbip-document-tcp-wrappers.patch
 kbuild-fix-recordmcount-dependency.patch
+perf-workaround-perl-bool-definition-conflict.patch