Package: deal.ii / 6.3.1-1

tbb.patch Patch series | download
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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
Index: deal.ii-6.3.1/common/Make.global_options.in
===================================================================
--- deal.ii-6.3.1.orig/common/Make.global_options.in	2010-07-22 13:05:21.000000000 +0200
+++ deal.ii-6.3.1/common/Make.global_options.in	2010-07-22 13:05:37.000000000 +0200
@@ -235,8 +235,8 @@
 
 # need to link with libtbb if we're using threads
 ifeq ($(enable-threads),yes)
-  lib-contrib-tbb.g = $D/lib/libtbb_debug$(shared-lib-suffix)
-  lib-contrib-tbb.o = $D/lib/libtbb$(shared-lib-suffix)
+  lib-contrib-tbb.g = -ltbb
+  lib-contrib-tbb.o = -ltbb
 endif
 
 # set paths to all the libraries we need:
@@ -319,7 +319,7 @@
 endif
 
 ifeq ($(enable-threads),yes)
-  INCLUDE += -I$(shell echo $D/contrib/tbb/tbb*/include)
+  INCLUDE += -I/usr/include/tbb
 endif
 
 # compiler flags for debug and optimized mode
Index: deal.ii-6.3.1/contrib/Makefile.in
===================================================================
--- deal.ii-6.3.1.orig/contrib/Makefile.in	2010-07-22 13:04:49.000000000 +0200
+++ deal.ii-6.3.1/contrib/Makefile.in	2010-07-22 13:05:37.000000000 +0200
@@ -38,15 +38,6 @@
 endif
 
 
-ifeq ($(enable-threads),yes)
-tbb:
-	@cd tbb ; $(MAKE)
-
-tbb-clean:
-	@cd tbb ; $(MAKE) clean
-else
-tbb tbb-clean:
-endif
 
 
 # generic targets
Index: deal.ii-6.3.1/base/Makefile
===================================================================
--- deal.ii-6.3.1.orig/base/Makefile	2010-07-22 13:04:49.000000000 +0200
+++ deal.ii-6.3.1/base/Makefile	2010-07-22 13:05:37.000000000 +0200
@@ -57,8 +57,8 @@
   endif
 
   ifeq ($(enable-threads),yes)
-    deplibs.g += $D/lib/libtbb_debug$(shared-lib-suffix)
-    deplibs.o += $D/lib/libtbb$(shared-lib-suffix)
+    deplibs.g += $(lib-contrib-tbb.g)
+    deplibs.o += $(lib-contrib-tbb.o)
   endif
 
 else