On 20/02/2012 12:08, Jonathan WRIGHT wrote:
Sorry, last time around I simply missed that there were patches to merge
there. I've merged your changes to aksetup. Can you explain your tss
cleanup changes? Those didn't necessarily seem harmless, so I would like
to understand what I'm doing before I grab them. Also, I believe I've
updated boost (in git) since your patch--can you please verify that it's
still necessary?
Hi Andreas,
Sorry for the multiple mails. The following seems like a cleaner patch.
first diff picks up tss_null.cpp, second causes it to be used. Where it
says "BOOST_THREAD_BUILD_DLL" it could also say "BOOST_THREAD_BUILD_LIB"
but I get the impression that dll is more correct for building a pyd?
Suggestion that this is OK is here:
http://comments.gmane.org/gmane.comp.lib.boost.user/35505
I've also asked the Cplusplus sig for advice.
Thanks,
Jon
===
$ git diff
diff --git a/aksetup_helper.py b/aksetup_helper.py
index 56f93b9..3c2ba69 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -577,6 +577,8 @@ def set_up_shipped_boost_if_requested(project_name,
conf):
if sys.platform == "win32":
source_files += glob(
"bpl-subset/bpl_subset/libs/thread/src/win32/*.cpp")
+ source_files += glob(
+ "bpl-subset/bpl_subset/libs/thread/src/*.cpp")
else:
source_files += glob(
"bpl-subset/bpl_subset/libs/thread/src/pthread/*.cpp")
@@ -599,7 +601,7 @@ def set_up_shipped_boost_if_requested(project_name,
conf):
{
# do not pick up libboost link dependency on windows
"BOOST_ALL_NO_LIB": 1,
-
+ "BOOST_THREAD_BUILD_DLL": 1,
"BOOST_MULTI_INDEX_DISABLE_SERIALIZATION": 1,
"BOOST_PYTHON_SOURCE": 1,
"boost": '%sboost' % project_name
_______________________________________________
PyOpenCL mailing list
[email protected]
http://lists.tiker.net/listinfo/pyopencl
