1 |
bicatali 12/06/01 17:58:45 |
2 |
|
3 |
Added: tbb-4.0.297-ldflags.patch |
4 |
tbb-4.0.297-underlinking.patch |
5 |
Removed: tbb-3.0.174-gcc46.patch |
6 |
Log: |
7 |
Respect LDFLAGS (bug #418453) and fixed underlinking at test phase (bug #418447), thanks hasufell for his patches |
8 |
|
9 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/files/tbb-4.0.297-ldflags.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: tbb-4.0.297-ldflags.patch |
18 |
=================================================================== |
19 |
From: Julian Ospald <hasufell@g.o> |
20 |
Date: Thu May 31 21:37:47 UTC 2012 |
21 |
Subject: build system |
22 |
|
23 |
respect LDFLAGS properly |
24 |
wrt https://bugs.gentoo.org/show_bug.cgi?id=418453 |
25 |
|
26 |
--- build/common_rules.inc |
27 |
+++ build/common_rules.inc |
28 |
@@ -44,8 +44,6 @@ |
29 |
ifeq ($(tbb_cpf),1) |
30 |
CPLUS_FLAGS += $(DEFINE_KEY)__TBB_CPF_BUILD=1 |
31 |
endif |
32 |
-LINK_FLAGS += $(LDFLAGS) |
33 |
-LIB_LINK_FLAGS += $(LDFLAGS) |
34 |
CPLUS_FLAGS_NOSTRICT = $(subst -strict-ansi,-ansi,$(CPLUS_FLAGS)) |
35 |
|
36 |
LIB_LINK_CMD ?= $(CPLUS) $(PIC_KEY) |
37 |
--- build/Makefile.rml |
38 |
+++ build/Makefile.rml |
39 |
@@ -103,7 +103,7 @@ |
40 |
|
41 |
$(RML.DLL): BUILDING_LIBRARY = $(RML.DLL) |
42 |
$(RML.DLL): $(RML_TBB_DEP) $(RML_SERVER.OBJ) $(RML.RES) $(RML_NO_VERSION.DLL) $(RML_ASM.OBJ) |
43 |
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) |
44 |
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(RML.DLL) $(RML_SERVER.OBJ) $(RML_TBB_DEP) $(RML_ASM.OBJ) $(RML.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) |
45 |
|
46 |
ifneq (,$(RML_NO_VERSION.DLL)) |
47 |
$(RML_NO_VERSION.DLL): |
48 |
@@ -126,13 +126,13 @@ |
49 |
RML_TESTS = test_job_automaton.$(TEST_EXT) test_thread_monitor.$(TEST_EXT) test_rml_tbb.$(TEST_EXT) test_rml_omp.$(TEST_EXT) test_rml_mixed.$(TEST_EXT) test_rml_omp_c_linkage.$(TEST_EXT) |
50 |
|
51 |
test_rml_tbb.$(TEST_EXT): test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) |
52 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS) |
53 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_tbb.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS) |
54 |
|
55 |
test_rml_omp.$(TEST_EXT): test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) |
56 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS) |
57 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_omp.$(OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS) |
58 |
|
59 |
test_rml_mixed.$(TEST_EXT): test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) |
60 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS) |
61 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_rml_mixed.$(OBJ) $(RML_TBB_CLIENT.OBJ) $(RML_OMP_CLIENT.OBJ) $(TBB_DEP_RML_TEST) $(LIBS) $(LINK_FLAGS) |
62 |
|
63 |
rml_omp_stub.$(OBJ): rml_omp_stub.cpp |
64 |
$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(T_INCLUDES) $(PIC_KEY) $< |
65 |
@@ -141,7 +141,7 @@ |
66 |
$(CONLY) $(C_FLAGS) $(OUTPUT_KEY)$@ test_rml_omp_c_linkage.$(OBJ) rml_omp_stub.$(OBJ) omp_dynamic_link.$(OBJ) $(LIBS) $(LINK_FLAGS) |
67 |
|
68 |
test_%.$(TEST_EXT): test_%.$(OBJ) $(TBB_DEP_NON_RML_TEST) |
69 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS) |
70 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(TBB_DEP_NON_RML_TEST) $(LIBS) $(LINK_FLAGS) |
71 |
|
72 |
### run_cmd is usually empty |
73 |
rml_test: $(call cross_suffix,$(RML.DLL)) $(TEST_PREREQUISITE) $(RML_TESTS) |
74 |
--- build/Makefile.tbb |
75 |
+++ build/Makefile.tbb |
76 |
@@ -115,7 +115,7 @@ |
77 |
|
78 |
$(TBB.DLL): BUILDING_LIBRARY = $(TBB.DLL) |
79 |
$(TBB.DLL): $(TBB.OBJ) $(TBB.RES) tbbvars.sh $(TBB_NO_VERSION.DLL) |
80 |
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) |
81 |
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(TBB.DLL) $(TBB.OBJ) $(TBB.RES) $(LIB_LINK_LIBS) $(LIB_LINK_FLAGS) |
82 |
|
83 |
ifneq (,$(TBB_NO_VERSION.DLL)) |
84 |
$(TBB_NO_VERSION.DLL): |
85 |
--- build/Makefile.tbbmalloc |
86 |
+++ build/Makefile.tbbmalloc |
87 |
@@ -82,7 +82,7 @@ |
88 |
|
89 |
$(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL) |
90 |
$(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL) |
91 |
- $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS) |
92 |
+ $(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS) |
93 |
|
94 |
ifneq (,$(MALLOCPROXY.DEF)) |
95 |
tbbmallocproxy.def: $(MALLOCPROXY.DEF) |
96 |
@@ -95,7 +95,7 @@ |
97 |
ifneq (,$(MALLOCPROXY.DLL)) |
98 |
$(MALLOCPROXY.DLL): BUILDING_LIBRARY = $(MALLOCPROXY.DLL) |
99 |
$(MALLOCPROXY.DLL): $(PROXY.OBJ) $(MALLOCPROXY_NO_VERSION.DLL) $(MALLOC.DLL) $(MALLOC.RES) |
100 |
- $(LIB_LINK_CMD) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS) |
101 |
+ $(LIB_LINK_CMD) $(LDFLAGS) $(LIB_OUTPUT_KEY)$(MALLOCPROXY.DLL) $(PROXY.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(LINK_MALLOC.LIB) $(PROXY_LINK_FLAGS) |
102 |
endif |
103 |
|
104 |
ifneq (,$(MALLOC_NO_VERSION.DLL)) |
105 |
@@ -143,32 +143,32 @@ |
106 |
endif |
107 |
|
108 |
test_malloc_overload.$(TEST_EXT): test_malloc_overload.cpp |
109 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS) |
110 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(LIBS) $(LINK_FLAGS) |
111 |
test_malloc_overload_proxy.$(TEST_EXT): test_malloc_overload.cpp $(MALLOC_PROXY_LIB) |
112 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS) |
113 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(subst /MT,/MD,$(M_CPLUS_FLAGS)) $(LDFLAGS) $(M_INCLUDES) $< $(LIBDL) $(MALLOC_PROXY_LIB) $(LIBS) $(LINK_FLAGS) |
114 |
|
115 |
test_malloc_whitebox.$(TEST_EXT): test_malloc_whitebox.cpp $(MALLOC_ASM.OBJ) version_string.tmp |
116 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS) |
117 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $(INCLUDE_KEY). $< $(MALLOC_ASM.OBJ) $(LIBS) $(LIBDL) $(LINK_FLAGS) |
118 |
|
119 |
test_malloc_lib_unload.$(TEST_EXT): test_malloc_lib_unload.cpp test_malloc_lib_unload_dll.$(DLL) |
120 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS) |
121 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(M_CPLUS_FLAGS) $(LDFLAGS) $(M_INCLUDES) $< $(LIBS) test_malloc_lib_unload_dll.$(LIBEXT) $(LIBDL) $(LINK_FLAGS) |
122 |
|
123 |
$(MALLOC_MAIN_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB) |
124 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS) |
125 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_LIB) $(LIBS) $(LINK_FLAGS) |
126 |
|
127 |
ifeq (,$(NO_C_TESTS)) |
128 |
MALLOC_C_TESTS = test_malloc_pure_c.$(TEST_EXT) |
129 |
|
130 |
$(MALLOC_C_TESTS): %.$(TEST_EXT): %.$(OBJ) $(MALLOC_LIB) |
131 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBS) $(LINK_FLAGS) |
132 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBS) $(LINK_FLAGS) |
133 |
endif |
134 |
|
135 |
# Rules for generating a test DLL |
136 |
%_dll.$(DLL): %_dll.$(OBJ) |
137 |
- $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS) |
138 |
+ $(LIB_LINK_CMD) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(PIC_KEY) $< $(LIBS) $(DYLIB_KEY) $(LIB_LINK_FLAGS) |
139 |
|
140 |
test_malloc_atexit.$(TEST_EXT): test_malloc_atexit.$(OBJ) test_malloc_atexit_dll.$(DLL) |
141 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS) |
142 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(MALLOC_PROXY_LIB) $(MALLOC_LIB) test_malloc_atexit_dll.$(LIBEXT) $(LIBS) $(LINK_FLAGS) |
143 |
|
144 |
MALLOC_TESTS = $(MALLOC_MAIN_TESTS) $(MALLOC_C_TESTS) test_malloc_whitebox.$(TEST_EXT) |
145 |
ifneq (,$(MALLOCPROXY.DLL)) |
146 |
--- build/Makefile.tbbproxy |
147 |
+++ build/Makefile.tbbproxy |
148 |
@@ -102,7 +102,7 @@ |
149 |
|
150 |
# Link rules. |
151 |
$(PROXY_TESTS_EXES): %.$(TEST_EXT): %.$(OBJ) $(PROXY_LIB) |
152 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS) |
153 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(PROXY_LIB) $(LIBS) $(LIBDL) $(LINK_FLAGS) |
154 |
|
155 |
# Compilation rules. |
156 |
$(PROXY_TESTS_OBJS): %.$(OBJ): %.cpp |
157 |
--- build/Makefile.test |
158 |
+++ build/Makefile.test |
159 |
@@ -55,26 +55,26 @@ |
160 |
|
161 |
# Rule for generating executable test |
162 |
%.$(TEST_EXT): %.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB)) |
163 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) |
164 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) |
165 |
|
166 |
# Rules for generating a test DLL |
167 |
%_dll.$(DLL): %_dll.$(OBJ) $(TBB.LIB) |
168 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY) |
169 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) $(DYLIB_KEY) |
170 |
.PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL) |
171 |
|
172 |
# Rules for the tests, which use TBB in a dynamically loadable library |
173 |
test_model_plugin.$(TEST_EXT): CPLUS_FLAGS := $(CPLUS_FLAGS:$(USE_PROXY_FLAG)=) |
174 |
test_model_plugin.$(TEST_EXT): test_model_plugin.$(OBJ) test_model_plugin_dll.$(DLL) |
175 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS) |
176 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LIBDL) $(LIBS) $(LINK_FLAGS) |
177 |
test_cilk_dynamic_load.$(TEST_EXT): test_cilk_dynamic_load.$(OBJ) test_cilk_dynamic_load_dll.$(DLL) |
178 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS) |
179 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBDL) $(LIBS) $(LINK_FLAGS) |
180 |
|
181 |
# Workaround on cilkrts linkage known issue (see Intel(R) C++ Composer XE 2011 Release Notes) |
182 |
# The issue reveals itself if a version of binutils is prior to 2.17 |
183 |
ifeq (linux,$(tbb_os)) |
184 |
ifeq (icc,$(compiler)) |
185 |
test_cilk_interop.$(TEST_EXT): test_cilk_interop.$(OBJ) $(TBB.LIB) $(if $(use_proxy),$(LINK_TBB.LIB)) |
186 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts |
187 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) -lcilkrts |
188 |
endif |
189 |
endif |
190 |
|
191 |
@@ -92,18 +92,18 @@ |
192 |
$(TASK_CPP_DIRECTLY_INCLUDED): WARNING_KEY += $(WARNING_SUPPRESS) |
193 |
|
194 |
$(TASK_CPP_DIRECTLY_INCLUDED): %.$(TEST_EXT) : %.$(OBJ) $(TASK_CPP_DEPENDENCIES) |
195 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS) |
196 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $^ $(LIBDL) $(LIBS) $(LINK_FLAGS) |
197 |
|
198 |
test_tbb_header2.$(OBJ): test_tbb_header.cpp |
199 |
$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_SECONDARY=1 $< $(OUTPUTOBJ_KEY)$@ |
200 |
|
201 |
# Detecting "multiple definition" linker error using the test that covers the whole library |
202 |
test_tbb_header.$(TEST_EXT): test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(TBB.LIB) |
203 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) |
204 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) test_tbb_header.$(OBJ) test_tbb_header2.$(OBJ) $(LINK_TBB.LIB) $(LIBS) $(LINK_FLAGS) |
205 |
|
206 |
# Checks that TBB atomics work correctly in position independent code |
207 |
test_atomic_pic.$(TEST_EXT): test_atomic.cpp |
208 |
- $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) |
209 |
+ $(CPLUS) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(PIC_KEY) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(LDFLAGS) $(INCLUDES) $(DEFINE_KEY)__TBB_TEST_PIC=1 $< $(LINK_TBB.LIB) $(LIBS) $(AUX_LIBS) $(LINK_FLAGS) |
210 |
|
211 |
# The main list of TBB tests |
212 |
TEST_TBB_PLAIN.EXE = test_assembly.$(TEST_EXT) \ |
213 |
@@ -188,7 +188,7 @@ |
214 |
ifdef OPENMP_FLAG |
215 |
TEST_TBB_PLAIN.EXE += test_tbb_openmp |
216 |
test_openmp.$(TEST_EXT): test_openmp.cpp |
217 |
- $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS) |
218 |
+ $(CPLUS) $(OPENMP_FLAG) $(OUTPUT_KEY)$@ $(CPLUS_FLAGS) $(LDFLAGS) $(INCLUDES) $< $(LIBS) $(LINK_TBB.LIB) $(LINK_FLAGS) |
219 |
.PHONY: test_tbb_openmp |
220 |
test_tbb_openmp: $(TEST_PREREQUISITE) test_openmp.$(TEST_EXT) |
221 |
$(run_cmd) ./test_openmp.$(TEST_EXT) 1:4 |
222 |
|
223 |
|
224 |
|
225 |
1.1 dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch |
226 |
|
227 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch?rev=1.1&view=markup |
228 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-cpp/tbb/files/tbb-4.0.297-underlinking.patch?rev=1.1&content-type=text/plain |
229 |
|
230 |
Index: tbb-4.0.297-underlinking.patch |
231 |
=================================================================== |
232 |
From: Julian Ospald <hasufell@g.o> |
233 |
Date: Thu May 31 21:37:47 UTC 2012 |
234 |
Subject: build system |
235 |
|
236 |
fix underlinking in test phase |
237 |
wrt https://bugs.gentoo.org/show_bug.cgi?id=418447 |
238 |
|
239 |
--- build/Makefile.test |
240 |
+++ build/Makefile.test |
241 |
@@ -48,8 +48,8 @@ |
242 |
USE_PROXY_FLAG = $(DEFINE_KEY)HARNESS_USE_PROXY |
243 |
CPLUS_FLAGS += $(USE_PROXY_FLAG) |
244 |
LINK_TBB.LIB = $(PROXY.LIB) |
245 |
- LIBS += $(LIBDL) |
246 |
-endif |
247 |
+endif |
248 |
+LIBS += $(LIBDL) |
249 |
|
250 |
include $(tbb_root)/build/common_rules.inc |