[tbb] 64/64: Imported Debian patch 4.3~20150611-2

[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 e7a8224e9f06507555e68e906c0f854bd9f6b865
Author: Steve Capper <steven.capper at gmail.com>
Date:   Fri Jun 3 20:30:33 2016 +0100

    Imported Debian patch 4.3~20150611-2
---
 debian/changelog                           |  7 +++++++
 debian/patches/allow-armel-build.patch     | 13 +++++++++++++
 debian/patches/dump-cpuinfo.patch          |  0
 debian/patches/series                      |  2 +-
 debian/patches/set-test-timeout.patch      | 19 -------------------
 debian/patches/tally-unit-test-fails.patch | 11 ++++++++---
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a625f66..a1bf630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tbb (4.3~20150611-2) unstable; urgency=medium
+
+  * Add support for armel by distinguishing from armhf.
+  * Fold in unit test timeout logic in to tally patch.
+
+ -- Steve Capper <steven.capper at gmail.com>  Fri, 03 Jun 2016 20:30:33 +0100
+
 tbb (4.3~20150611-1) unstable; urgency=medium
 
   * Dump out /proc/cpuinfo and gcc preprocessor directives on build to
diff --git a/debian/patches/allow-armel-build.patch b/debian/patches/allow-armel-build.patch
new file mode 100644
index 0000000..b7466d3
--- /dev/null
+++ b/debian/patches/allow-armel-build.patch
@@ -0,0 +1,13 @@
+Index: tbb-4.3~20150611/include/tbb/tbb_machine.h
+===================================================================
+--- tbb-4.3~20150611.orig/include/tbb/tbb_machine.h
++++ tbb-4.3~20150611/include/tbb/tbb_machine.h
+@@ -246,7 +246,7 @@ template<> struct atomic_selector<8> {
+         #include "machine/linux_ia64.h"
+     #elif __powerpc__
+         #include "machine/mac_ppc.h"
+-    #elif __arm__
++    #elif ( defined(__arm__) && (__ARM_ARCH == 7) )
+         #include "machine/gcc_armv7.h"
+     #elif __TBB_GCC_BUILTIN_ATOMICS_PRESENT
+         #include "machine/gcc_generic.h"
diff --git a/debian/patches/dump-cpuinfo.patch b/debian/patches/dump-cpuinfo.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/series b/debian/patches/series
index a1b17ad..4a8d6f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,5 @@ tally-unit-test-fails.patch
 atomic-rework.patch
 gcc-atomic-detection.patch
 gcc-atomic-always.patch
+allow-armel-build.patch
 tweak-64bits-s390-hppa.patch
-set-test-timeout.patch
diff --git a/debian/patches/set-test-timeout.patch b/debian/patches/set-test-timeout.patch
deleted file mode 100644
index 06da763..0000000
--- a/debian/patches/set-test-timeout.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: tbb-4.3~20150611/build/test_summary.sh
-===================================================================
---- tbb-4.3~20150611.orig/build/test_summary.sh
-+++ tbb-4.3~20150611/build/test_summary.sh
-@@ -19,9 +19,13 @@ if [ "$1" = "--dump" ]; then
-     exit 0
- fi
- 
--eval $@
-+eval timeout 10.0m $@
- rc=$?
- 
-+if [ "$rc" -eq "124" ]; then
-+    echo "TIMEOUT: $@"
-+fi
-+
- if [ "$rc" -eq "0" ]; then
-     echo "$@" >> tests.passed
- else
diff --git a/debian/patches/tally-unit-test-fails.patch b/debian/patches/tally-unit-test-fails.patch
index 5e29665..3645ca5 100644
--- a/debian/patches/tally-unit-test-fails.patch
+++ b/debian/patches/tally-unit-test-fails.patch
@@ -17,11 +17,13 @@ Index: tbb-4.3~20150611/build/test_summary.sh
 ===================================================================
 --- /dev/null
 +++ tbb-4.3~20150611/build/test_summary.sh
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,36 @@
 +#!/bin/sh
 +
 +# Rather than fail on first test, we keep a tally of tests that
 +# pass/fail; as some are running unpredictably on some systems.
++# Also, if a test takes > 10 minutes to run, we fail and log the
++# timeout.
 +
 +# We do fail if we can't compile a test.
 +
@@ -39,10 +41,13 @@ Index: tbb-4.3~20150611/build/test_summary.sh
 +    exit 0
 +fi
 +
-+eval $@
++eval timeout 10.0m $@
 +rc=$?
 +
-+if [ "$rc" -eq "0" ]; then
++if [ "$rc" -eq "124" ]; then
++    echo "TIMEOUT: $@"
++    echo "$@ - TIMEOUT" >> tests.failed
++elif [ "$rc" -eq "0" ]; then
 +    echo "$@" >> tests.passed
 +else
 +    echo "$@" >> tests.failed

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