[clasp] 09/10: debian/rules: drop libtbb-dev and use c++11 multi-threading

Thomas Krennwallner tkren-guest at moszumanska.debian.org
Fri Dec 2 07:28:41 UTC 2016


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

tkren-guest pushed a commit to branch devel
in repository clasp.

commit 5b7e9f7823c160ac043f239a7b3d9a7f668573ca
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Thu Dec 1 08:18:58 2016 +0100

    debian/rules: drop libtbb-dev and use c++11 multi-threading
---
 debian/rules | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4913d18..63b25c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,27 +4,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# compile with libtbb-dev only with linux 64bit intel/ppc architectures,
-# fallback in pentium4 processors is not implemented, see also note of
-# libtbb-dev:
-#
-# Note: if you are a user of the i386 architecture, i.e., 32-bit Intel
-# or compatible hardware, this package only supports Pentium4-compatible
-# and higher processors.
-#
-arch = $(shell dpkg-architecture -qDEB_BUILD_ARCH | egrep -x "(amd64|ia64|ppc64|ppc64el)")
-os = $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS | grep linux)
-
-# use hardening config flags for compiling clasp
+# use custom hardening config flags for compiling clasp
 CONFIG=hardening
-CONFIGPARMS = --prefix=/usr
-TOPBUILDDIR = build/$(CONFIG)
-ifeq ($(and $(if $(os),good), $(if $(arch),good)), good)
-	TBBINCLUDEDIR=$(shell pkg-config --variable=includedir tbb)
-	TBBLIBDIR=$(shell pkg-config --variable=libdir tbb)
-	CONFIGPARMS += --with-mt TBB_INCLUDE=$(TBBINCLUDEDIR) TBB_LIB=$(TBBLIBDIR)
-	TOPBUILDDIR = build/$(CONFIG)_mt
-endif
+# use c++11 threads
+CONFIGPARMS = --prefix=/usr --with-mt=std
+# threading implies _mt builddir
+TOPBUILDDIR = build/$(CONFIG)_mt
 
 #
 # export CXXFLAGS and LDFLAGS for configure.sh

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



More information about the debian-science-commits mailing list