[tbb] 63/64: Imported Debian patch 4.3~20150611-1
Graham Inggs
ginggs at moszumanska.debian.org
Mon Jul 3 12:28:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
ginggs pushed a commit to branch master
in repository tbb.
commit 635c9f649e9c5882fbb1b66b629b8360e7fcd2d1
Author: Steve Capper <steven.capper at gmail.com>
Date: Mon May 30 17:01:44 2016 +0100
Imported Debian patch 4.3~20150611-1
---
debian/changelog | 32 +++++++++++++++++++++++++++++
debian/control | 6 +++++-
debian/libtbb-dev.dirs | 3 ---
debian/libtbb-dev.install | 5 +++--
debian/libtbb-dev.links | 7 ++++---
debian/libtbb2.dirs | 1 -
debian/libtbb2.install | 3 ++-
debian/patches/dump-cpuinfo.patch | 0
debian/patches/gcc-atomic-always.patch | 15 ++++++++++++++
debian/patches/gcc-atomic-detection.patch | 20 ++++++++++++++++++
debian/patches/ppc32_atomics.patch | 28 -------------------------
debian/patches/series | 5 ++++-
debian/patches/set-test-timeout.patch | 19 +++++++++++++++++
debian/patches/tweak-64bits-s390-hppa.patch | 20 ++++++++++++++++++
debian/rules | 9 ++++++--
debian/tbb-examples.README.Debian | 2 +-
debian/tbb.pc.in | 6 +++---
17 files changed, 135 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e2f5758..a625f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+tbb (4.3~20150611-1) unstable; urgency=medium
+
+ * Dump out /proc/cpuinfo and gcc preprocessor directives on build to
+ help debug issues.
+ * Timeout of 10 minutes set on unit tests. Any tests that timeout are
+ logged.
+
+ [Mathieu Malaterre ]
+ * Tweak 64 bits detection.
+
+ -- Steve Capper <steven.capper at gmail.com> Mon, 30 May 2016 17:01:44 +0100
+
+tbb (4.3~20150611-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Matthias Klose ]
+ * Upload version from experimental to sid, fixing build with GCC 5.
+ Closes: #778139.
+ * The architecture list is now marked as linux-any. Closes: #748876.
+ * Multiarchify the packages (Marc Glisse). Closes: #751689.
+ * The new upstream fixes the check for __TBB_CPP11_TYPE_PROPERTIES_PRESENT.
+ Closes: #779553.
+
+ [ Adam Conrad ]
+ * gcc-atomic-detection.patch: Fix the gcc atomic detection to work for
+ gcc-5.x and up, as well as adding -latomic to LIBS (closes: #787084)
+ * gcc-atomic-always.patch: Always define TBB_USE_GCC_BUILTINS for GCC.
+ * debian/tbb.pc.in: Add -latomic to the pkg-config file for the above.
+
+ -- Matthias Klose <doko at debian.org> Sat, 05 Sep 2015 19:06:39 +0200
+
tbb (4.3~20150611-1~exp3) experimental; urgency=medium
* Put Mathieu's ppc32 gcc atomic disable patch back in (it shouldn't
diff --git a/debian/control b/debian/control
index 2a2aac1..b3bc756 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tbb
Priority: extra
Maintainer: Steve Capper <steven.capper at gmail.com>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), libjs-jquery, dh-exec (>=0.3)
Standards-Version: 3.9.6
Section: libs
Homepage: http://threadingbuildingblocks.org/
@@ -9,6 +9,7 @@ Homepage: http://threadingbuildingblocks.org/
Package: libtbb-dev
Section: libdevel
Architecture: linux-any
+Multi-arch: same
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Suggests: tbb-examples, libtbb-doc
Description: parallelism library for C++ - development files
@@ -25,6 +26,8 @@ Description: parallelism library for C++ - development files
Package: libtbb2
Architecture: linux-any
+Multi-arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: parallelism library for C++ - runtime files
TBB is a library that helps you leverage multi-core processor
@@ -41,6 +44,7 @@ Description: parallelism library for C++ - runtime files
Package: libtbb2-dbg
Section: debug
Architecture: linux-any
+Multi-arch: same
Depends: libtbb2 (= ${binary:Version}), ${misc:Depends}
Description: parallelism library for C++ - debugging symbols
TBB is a library that helps you leverage multi-core processor
diff --git a/debian/libtbb-dev.dirs b/debian/libtbb-dev.dirs
deleted file mode 100644
index 13cdd2e..0000000
--- a/debian/libtbb-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib
-usr/lib/pkgconfig
diff --git a/debian/libtbb-dev.install b/debian/libtbb-dev.install
old mode 100644
new mode 100755
index d1207d3..80f6d75
--- a/debian/libtbb-dev.install
+++ b/debian/libtbb-dev.install
@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
include/tbb usr/include
-build/linux_*_release/lib*.so usr/lib
-debian/tbb.pc usr/lib/pkgconfig
+build/linux_*_release/lib*.so usr/lib/${DEB_HOST_MULTIARCH}
+debian/tbb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libtbb-dev.links b/debian/libtbb-dev.links
old mode 100644
new mode 100755
index 670c903..6ec86aa
--- a/debian/libtbb-dev.links
+++ b/debian/libtbb-dev.links
@@ -1,3 +1,4 @@
-usr/lib/libtbb.so.2 usr/lib/libtbb.so
-usr/lib/libtbbmalloc.so.2 usr/lib/libtbbmalloc.so
-usr/lib/libtbbmalloc_proxy.so.2 usr/lib/libtbbmalloc_proxy.so
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbb.so
+usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc.so
+usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libtbbmalloc_proxy.so
diff --git a/debian/libtbb2.dirs b/debian/libtbb2.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libtbb2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libtbb2.install b/debian/libtbb2.install
old mode 100644
new mode 100755
index a94ab11..c61a3cd
--- a/debian/libtbb2.install
+++ b/debian/libtbb2.install
@@ -1 +1,2 @@
-build/linux_*_release/lib*.so.* usr/lib
+#! /usr/bin/dh-exec
+build/linux_*_release/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/patches/dump-cpuinfo.patch b/debian/patches/dump-cpuinfo.patch
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/gcc-atomic-always.patch b/debian/patches/gcc-atomic-always.patch
new file mode 100644
index 0000000..8e7c72a
--- /dev/null
+++ b/debian/patches/gcc-atomic-always.patch
@@ -0,0 +1,15 @@
+Description: Always define TBB_USE_GCC_BUILTINS on GCC.
+Author: Adam Conrad <adconrad at ubuntu.com>
+
+--- tbb-4.3~20150611.orig/include/tbb/tbb_machine.h
++++ tbb-4.3~20150611/include/tbb/tbb_machine.h
+@@ -231,6 +231,9 @@ template<> struct atomic_selector<8> {
+
+ #elif __linux__ || __FreeBSD__ || __NetBSD__
+
++ #ifndef TBB_USE_GCC_BUILTINS
++ #define TBB_USE_GCC_BUILTINS 1
++ #endif
+ #if (TBB_USE_GCC_BUILTINS && __TBB_GCC_BUILTIN_ATOMICS_PRESENT)
+ #include "machine/gcc_generic.h"
+ #elif (TBB_USE_ICC_BUILTINS && __TBB_ICC_BUILTIN_ATOMICS_PRESENT)
diff --git a/debian/patches/gcc-atomic-detection.patch b/debian/patches/gcc-atomic-detection.patch
new file mode 100644
index 0000000..f7f1cc5
--- /dev/null
+++ b/debian/patches/gcc-atomic-detection.patch
@@ -0,0 +1,20 @@
+Description: Fix the gcc atomic detection to work for
+ gcc-5.x and up, as well as adding -latomic to LIBS
+Author: Adam Conrad <adconrad at ubuntu.com>
+Bug-Debian: https://bugs.debian.org/787084
+Last-Update: 2015-08-11
+
+--- tbb-4.3~20150611.orig/build/linux.gcc.inc
++++ tbb-4.3~20150611/build/linux.gcc.inc
+@@ -49,8 +49,10 @@ ifneq (,$(shell gcc -dumpversion | egrep
+ endif
+
+ # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them
+-ifneq (,$(shell gcc -dumpversion | egrep "^4\.[8-9]"))
++# furthemore, on gcc 4.8 and later, some arches require -ltatomic to use atomic intrinsics
++ifneq (,$(shell gcc -dumpversion | egrep "^(4\.[8-9]|[5-9])"))
+ RTM_KEY = -mrtm
++ LIBS += -latomic
+ endif
+
+ ifeq ($(cfg), release)
diff --git a/debian/patches/ppc32_atomics.patch b/debian/patches/ppc32_atomics.patch
deleted file mode 100644
index 41e5aab..0000000
--- a/debian/patches/ppc32_atomics.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
-Index: tbb-4.3~20150611/include/tbb/tbb_config.h
-===================================================================
---- tbb-4.3~20150611.orig/include/tbb/tbb_config.h
-+++ tbb-4.3~20150611/include/tbb/tbb_config.h
-@@ -268,7 +268,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 d05c4a3..a1b17ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,8 @@ failonbadtests.patch
buildi386.patch
linuxreleasedetect.patch
tally-unit-test-fails.patch
-ppc32_atomics.patch
atomic-rework.patch
+gcc-atomic-detection.patch
+gcc-atomic-always.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
new file mode 100644
index 0000000..06da763
--- /dev/null
+++ b/debian/patches/set-test-timeout.patch
@@ -0,0 +1,19 @@
+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/tweak-64bits-s390-hppa.patch b/debian/patches/tweak-64bits-s390-hppa.patch
new file mode 100644
index 0000000..e8bd059
--- /dev/null
+++ b/debian/patches/tweak-64bits-s390-hppa.patch
@@ -0,0 +1,20 @@
+Description: Tweak 64 bits detection
+Author: Mathieu Malaterre <malat at debian.org>
+
+Index: tbb-4.3~20150611/build/linux.inc
+===================================================================
+--- tbb-4.3~20150611.orig/build/linux.inc
++++ tbb-4.3~20150611/build/linux.inc
+@@ -119,6 +119,12 @@ endif
+ ifeq ($(arch),sparc64)
+ def_prefix = lin64
+ endif
++ifeq ($(arch),s390x)
++ def_prefix = lin64
++endif
++ifeq ($(arch),hppa)
++ def_prefix = lin64
++endif
+ ifeq ($(arch),armv7)
+ def_prefix = lin32
+ endif
diff --git a/debian/rules b/debian/rules
index 48ad354..43b8be1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,13 @@ CXXFLAGS+=$(CPPFLAGS)
VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
override_dh_auto_build:
- sed -e"s/@VERSION@/$(VERSION)/g" debian/tbb.pc.in > debian/tbb.pc
- dh_auto_build
+# dump out diagnostics
+ cat /proc/cpuinfo
+ gcc -dM -E - < /dev/null
+
+ sed -e"s/@VERSION@/$(VERSION)/g;s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
+ debian/tbb.pc.in > debian/tbb.pc
+ dh_auto_build
# Makefiles should not be compressed (tbb-examples)
override_dh_compress-indep:
diff --git a/debian/tbb-examples.README.Debian b/debian/tbb-examples.README.Debian
index a8742ca..884abed 100644
--- a/debian/tbb-examples.README.Debian
+++ b/debian/tbb-examples.README.Debian
@@ -4,7 +4,7 @@ tbb for Debian
This is the Intel Threading Building Blocks package. It comes from the
"Commercial Aligned Release" series of TBB releases.
-This package ships a pkg-config file in /usr/lib/pkgconfig/tbb.pc. Here is
+This package ships a pkg-config file in /usr/lib/*/pkgconfig/tbb.pc. Here is
an example of how it is used:
gcc -o test test.c `pkg-config --libs --cflags tbb`
diff --git a/debian/tbb.pc.in b/debian/tbb.pc.in
index 140fe33..ea06864 100644
--- a/debian/tbb.pc.in
+++ b/debian/tbb.pc.in
@@ -1,11 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@
includedir=${prefix}/include
Name: Threading Building Blocks
Description: Intel's parallelism library for C++
URL: http://www.threadingbuildingblocks.org/
Version: @VERSION@
-Libs: -L${libdir} -ltbb
-Cflags: -I${includedir}
+Libs: -ltbb -latomic
+Cflags:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git
More information about the debian-science-commits
mailing list