Hi Rob, No problem - I was calling it in as I had figured that the phenix builds must have been OK so was checking if we were missing something in DIALS land The builds reverted to green after your fix commit… Cheers Graeme On 1 Feb 2018, at 21:47, R. D. Oeffner mailto:[email protected]> wrote: Apologies, that was my fault breaking the build. I believe it is working now again as I committed a fix for the problem. Do let me know if it still fails. I'm puzzled why my first commit failed as I did do a successful full build of Phenix on linux testing these changes. Rob -----Original Message----- From: [email protected]mailto:[email protected] Sent: Thursday, February 1, 2018 7:07 PM To: [email protected]mailto:[email protected] Subject: [cctbxbb] Fwd: [git/cctbx] master: Allow compiling standalone statically linked executable of Phaser on Windows and MinGW platforms requires: static linking of some boost libraries, additional preprocessor defines for Windows build, additional library specified ... Tried sending before got rejected ... Begin forwarded message: From: Graeme Winter mailto:[email protected]mailto:[email protected]> Date: 1 February 2018 at 18:51:58 GMT To: [email protected]mailto:[email protected]mailto:[email protected] Cc: [email protected]mailto:[email protected]mailto:[email protected] Subject: Re: [git/cctbx] master: Allow compiling standalone statically linked executable of Phaser on Windows and MinGW platforms requires: static linking of some boost libraries, additional preprocessor defines for Windows build, additional library specified for rstbx build (29fc06f71) Just after this commit all our builds died at diamond Is build bot happy? Curious if local issue Cheers Graeme On 1 Feb 2018, at 18:07, CCTBX commit mailto:[email protected]mailto:[email protected]> wrote: Repository : ssh://g18-sc-serv-04.diamond.ac.uk/cctbx On branch : master ________________________________ commit 29fc06f714e1059cb9f4eaac35cc2024178237dc Author: Robert Oeffner mailto:[email protected]mailto:[email protected]> Date: Thu Feb 1 18:07:49 2018 +0000 Allow compiling standalone statically linked executable of Phaser on Windows and MinGW platforms requires: static linking of some boost libraries, additional preprocessor defines for Windows build, additional library specified for rstbx build ________________________________ 29fc06f714e1059cb9f4eaac35cc2024178237dc boost_adaptbx/SConscript | 13 +++++++------ libtbx/SConscript | 4 +++- rstbx/SConscript | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/boost_adaptbx/SConscript b/boost_adaptbx/SConscript index 8696c1510..b8b58ce2d 100644 --- a/boost_adaptbx/SConscript +++ b/boost_adaptbx/SConscript @@ -32,8 +32,9 @@ print("BOOST_VERSION: %i" %env_etc.boost_version) # any issue. if (libtbx.env.build_options.enable_boost_threads and env_etc.boost_thread_support): - boost_thread_uses_winthreads = (sys.platform == 'win32' and - not env_etc.compiler.endswith('mingw')) + boost_thread_uses_winthreads = (sys.platform == 'win32') + # MinGW compiler 5.3.0 appears to compile boost_threads + # with the same condition as win32. # This environment is to be used latter to build Boost libraries # So we need a clean one without extra library linking. env_boost_shlibs_base = env_base.Copy() @@ -264,7 +265,7 @@ e.g. with "yum install python-dev" or "apt-get install python-dev". libs.append('rt') if boost_thread_uses_winthreads: libs.append('boost_chrono') - env_boost_threads.SharedLibrary( + env_boost_threads.StaticLibrary( target='#lib/boost_thread', source=boost_thread_src, LIBS=libs) @@ -280,7 +281,7 @@ e.g. with "yum install python-dev" or "apt-get install python-dev". # For Windows (c.f. point 2 above) env_boost_system.Append( CPPDEFINES={'BOOST_SYSTEM_DYN_LINK':1}) - env_boost_system.SharedLibrary( + env_boost_system.StaticLibrary( target='#lib/boost_system', source=boost_system_src) @@ -294,7 +295,7 @@ e.g. with "yum install python-dev" or "apt-get install python-dev". os.path.join(env_etc.boost_dist, 'libs', 'chrono', 'src', '*.cpp'))] # For Windows (c.f. point 2 above) env_boost_chrono.Append(CPPDEFINES={'BOOST_CHRONO_DYN_LINK':1}) - env_boost_chrono.SharedLibrary( + env_boost_chrono.StaticLibrary( target='#lib/boost_chrono', source=boost_chrono_src, LIBS=['boost_system']) @@ -308,7 +309,7 @@ e.g. with "yum install python-dev" or "apt-get install python-dev". env_etc.include_registry.append( env=env_boost_threads_test, paths=[env_etc.boost_adaptbx_include]) - env_boost_threads_test.SharedLibrary( + env_boost_threads_test.StaticLibrary( target="#lib/boost_adaptbx_boost_thread_test_ext", source="tests/boost_thread_test.cpp") diff --git a/libtbx/SConscript b/libtbx/SConscript index b4fcc5df9..b956956f2 100644 --- a/libtbx/SConscript +++ b/libtbx/SConscript @@ -364,7 +364,9 @@ For newer versions, please adjust this SConscript. "/D_SECURE_SCL=0", "/D_CRT_SECURE_NO_DEPRECATE", "/DNOMINMAX", - #"/DWIN32", + "/DWIN32", + "/DDLL_EXPORTS", + "/D_WIN32_WINNT=_WIN32_WINNT_WIN7", "/bigobj", # for heavy use of template libraries "/wd4996", # warning C4996: ... was declared deprecated "/wd4068", # warning C4068: unknown pragma diff --git a/rstbx/SConscript b/rstbx/SConscript index 422a9864c..76ba4d1c5 100644 --- a/rstbx/SConscript +++ b/rstbx/SConscript @@ -40,7 +40,7 @@ if (not env_etc.no_boost_python): Import("env_boost_python_ext") env_rstbx_boost_python_ext = env_boost_python_ext.Clone() env_rstbx_boost_python_ext.Prepend( - LIBS=["rstbx", "cctbx", "scitbx_boost_python"]) + LIBS=["rstbx", "ann", "cctbx", "scitbx_boost_python"]) env_rstbx_boost_python_ext.SharedLibrary( target="#lib/rstbx_ext", source="ext.cpp") env_rstbx_boost_python_ext.SharedLibrary( -- This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail. Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd. Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message. Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom _______________________________________________ cctbxbb mailing list [email protected]mailto:[email protected] http://phenix-online.org/mailman/listinfo/cctbxbb --- This email has been checked for viruses by AVG. http://www.avg.comhttp://www.avg.com/ _______________________________________________ cctbxbb mailing list [email protected]mailto:[email protected] http://phenix-online.org/mailman/listinfo/cctbxbb