From df8cfcab03dc3f639af6d5bda0474b8d6a93a369 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 8 Oct 2008 06:30:38 +0000 Subject: [PATCH] + fixed building with boost-1_36 + corrected order of BOOST_TOOLKIT (create symlinks on OSX + boost-1_35) --- SConstruct | 2 +- bindings/python/SConscript | 6 +++--- plugins/input/shape/SConscript | 2 +- src/datasource_cache.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index ec66e9a84..45cb8c273 100644 --- a/SConstruct +++ b/SConstruct @@ -189,7 +189,7 @@ else: for count, libinfo in enumerate(BOOST_LIBSHEADERS): if env['THREADING'] == 'multi' : - if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] : + if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), 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 5d0471949..08b37b44f 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' % (thread_suffix,env['BOOST_APPEND'])) + libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix)) 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' % (thread_suffix,env['BOOST_APPEND'])) + libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix)) else : libraries.append('boost_regex%s' % env['BOOST_APPEND']) if env['THREADING'] == 'multi': - libraries.append('boost_thread%s%s' % (thread_suffix,env['BOOST_APPEND'])) + libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix)) 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/shape/SConscript b/plugins/input/shape/SConscript index d254aa21d..005201eef 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' % (thread_suffix,env['BOOST_APPEND']) ] + libraries = ['boost_iostreams%s%s' % (env['BOOST_APPEND'],thread_suffix) ] else: libraries = ['boost_iostreams%s' % (env['BOOST_APPEND']) ] diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp index beedbc650..1a074fd84 100644 --- a/src/datasource_cache.cpp +++ b/src/datasource_cache.cpp @@ -125,7 +125,7 @@ namespace mapnik { for (filesystem::directory_iterator itr(path);itr!=end_itr;++itr ) { - if (!is_directory( *itr ) && is_input_plugin(itr->leaf())) + if (!is_directory( *itr ) && is_input_plugin(itr->path().leaf())) { try {