diff --git a/SConstruct b/SConstruct index c7c8aeca2..0b816f679 100644 --- a/SConstruct +++ b/SConstruct @@ -154,7 +154,7 @@ CXX_LIBSHEADERS = [ ] BOOST_LIBSHEADERS = [ - # ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35 + ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35 ['filesystem', 'boost/filesystem/operations.hpp', True], ['regex', 'boost/regex.hpp', True], ['iostreams','boost/iostreams/device/mapped_file.hpp',True], @@ -181,7 +181,7 @@ else: for count, libinfo in enumerate(BOOST_LIBSHEADERS): if env['THREADING'] == 'multi' : - if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] : + if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] : color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0]) Exit(1) elif not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++') : diff --git a/bindings/python/SConscript b/bindings/python/SConscript index 08b37b44f..5d0471949 100644 --- a/bindings/python/SConscript +++ b/bindings/python/SConscript @@ -40,7 +40,7 @@ if env['PLATFORM'] == 'FreeBSD': linkflags = '' libraries = ['mapnik','png','jpeg'] if env['THREADING'] == 'multi': - libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix)) + libraries.append('boost_python%s%s' % (thread_suffix,env['BOOST_APPEND'])) else : libraries.append('boost_python%s' % env['BOOST_APPEND']) @@ -48,11 +48,11 @@ if env['PLATFORM'] == 'Darwin': libraries.append('icuuc') libraries.append('icudata') if env['THREADING'] == 'multi': - libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix)) + libraries.append('boost_regex%s%s' % (thread_suffix,env['BOOST_APPEND'])) else : libraries.append('boost_regex%s' % env['BOOST_APPEND']) if env['THREADING'] == 'multi': - libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix)) + libraries.append('boost_thread%s%s' % (thread_suffix,env['BOOST_APPEND'])) if '-DHAVE_PYCAIRO' in env['CXXFLAGS']: libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')]) linkflags = '-F/ -framework Python' diff --git a/plugins/input/postgis/SConscript b/plugins/input/postgis/SConscript index a0d1967c0..e9ba1a709 100644 --- a/plugins/input/postgis/SConscript +++ b/plugins/input/postgis/SConscript @@ -38,7 +38,7 @@ if env['PLATFORM'] == 'Darwin': libraries.append('icuuc') libraries.append('icudata') if env['THREADING'] == 'multi': - libraries.append('boost_thread%s-mt' % env['BOOST_APPEND']) + libraries.append('boost_thread-mt%s' % env['BOOST_APPEND']) postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) diff --git a/plugins/input/shape/SConscript b/plugins/input/shape/SConscript index 005201eef..d254aa21d 100644 --- a/plugins/input/shape/SConscript +++ b/plugins/input/shape/SConscript @@ -40,7 +40,7 @@ if env['PLATFORM'] == 'FreeBSD': thread_suffix = '' if env['THREADING'] == 'multi': - libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ] + libraries = ['boost_iostreams%s%s' % (thread_suffix,env['BOOST_APPEND']) ] else: libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ]