[tbb] 55/64: Imported Debian patch 4.2~20140122-4

[Graham Inggs]

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

ginggs pushed a commit to branch master
in repository tbb.

commit afdc1d89dd9c6db29a4b0d17ab983ebe81349724
Author: Steve Capper <steven.capper at gmail.com>
Date:   Thu Oct 30 17:55:02 2014 +0000

    Imported Debian patch 4.2~20140122-4
---
 debian/changelog                   |  9 +++++++++
 debian/control                     |  2 +-
 debian/patches/ppc32_atomics.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  4 ++++
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6b643ef..59cf78c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tbb (4.2~20140122-4) unstable; urgency=medium
+  * Bump standards version to 3.9.6.
+  * Add debian/tbb.pc to clean list.
+
+  [ Mathieu Malaterre ]
+  * Don't use gcc atomics for ppc32. Closes: #762656
+
+ -- Steve Capper <steven.capper at gmail.com>  Thu, 30 Oct 2014 17:55:02 +0000
+
 tbb (4.2~20140122-3) unstable; urgency=medium
 
   * Unit test execution failures no longer cause build to fail; instead take a
diff --git a/debian/control b/debian/control
index b9d51ce..156da7d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: tbb
 Priority: extra
 Maintainer: Steve Capper <steven.capper at gmail.com>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Section: libs
 Homepage: http://threadingbuildingblocks.org/
 
diff --git a/debian/patches/ppc32_atomics.patch b/debian/patches/ppc32_atomics.patch
new file mode 100644
index 0000000..8fe4f77
--- /dev/null
+++ b/debian/patches/ppc32_atomics.patch
@@ -0,0 +1,26 @@
+Description: Make the test suite compile on ppc32
+ where atomics implementation are missing
+ The code simply check ppc32 vs ppc64, the macros are defined on gcc 4.9.1
+Author: Mathieu Malaterre <malat at debian.org>
+Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63368
+Bug-Debian: http://bugs.debian.org/762656
+
+--- tbb-4.2~20140122.orig/include/tbb/tbb_config.h
++++ tbb-4.2~20140122/include/tbb/tbb_config.h
+@@ -195,7 +195,16 @@
+ /* TODO: change the version back to 4.1.2 once macro __TBB_WORD_SIZE become optional */
+ #if __TBB_GCC_VERSION >= 40306 || __INTEL_COMPILER >= 1200
+     /** built-in atomics available in GCC since 4.1.2 **/
++#if __PPC__ 
++#if __PPC64__ 
+     #define __TBB_GCC_BUILTIN_ATOMICS_PRESENT 1
++#else
++    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63368
++    #define __TBB_GCC_BUILTIN_ATOMICS_PRESENT 0
++#endif
++#else
++    #define __TBB_GCC_BUILTIN_ATOMICS_PRESENT 1
++#endif
+ #endif
+ 
+ #if __INTEL_COMPILER >= 1200
diff --git a/debian/patches/series b/debian/patches/series
index 816aeef..d482aa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ failonbadtests.patch
 buildi386.patch
 linuxreleasedetect.patch
 tally-unit-test-fails.patch
+ppc32_atomics.patch
diff --git a/debian/rules b/debian/rules
index b377cad..48ad354 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,3 +23,7 @@ override_dh_compress-indep:
 
 get-orig-source:
 	uscan --verbose --force-download --rename
+
+override_dh_auto_clean:
+	dh_auto_clean
+	touch debian/tbb.pc && rm debian/tbb.pc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git