1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
Author: Andreas Tille <tille@debian.org>, Nilesh Patra <nilesh@debian.org>
Description: Do not try to build removed tbb code copy but rather link to Debian packaged version
Forwarded: not-needed
Last-Update: Mon, 26 Nov 2018 16:10:58 +0100
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,5 +1,6 @@
PKG_CXXFLAGS = @CXX11STD@
+PKG_LIBS = -ltbb -ltbbmalloc
# If TBB_ROOT is defined, use it.
ifdef TBB_ROOT
@@ -27,10 +28,6 @@
PKG_CPPFLAGS = -I../inst/include
endif
-ifdef TBB_LIB
- PKG_LIBS = -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
-endif
-
ifeq ($(OS), Windows_NT)
USE_TBB=Windows
@@ -156,17 +153,10 @@
# NOTE: we do not want to clean ../inst/lib or ../inst/libs here,
# as we may be writing to those locations in multiarch builds
tbb-clean:
- @rm -rf ../inst/include/tbb
@rm -rf ../inst/include/oneapi
- @rm -rf ../inst/include/tbb_local
@rm -rf ../inst/include/serial
clean: tbb-clean
-ifdef TBB_LIB
@echo "Nothing to clean for TBB."
-else
- @(cd tbb/src; make clean)
-endif
-
endif
|
