Skip to content

Commit

Permalink
link all remaining plugins to boost_system to avoid potential linking…
Browse files Browse the repository at this point in the history
… errors with boost-trunk (upcoming 1.49) - closes #1070
  • Loading branch information
Dane Springmeyer committed Feb 10, 2012
1 parent 656436d commit b44a63a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions plugins/input/csv/build.py
Expand Up @@ -17,6 +17,7 @@

libraries = []
libraries.append('mapnik')
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append(env['ICU_LIB_NAME'])

TARGET = plugin_env.SharedLibrary(
Expand Down
1 change: 1 addition & 0 deletions plugins/input/gdal/build.py
Expand Up @@ -38,6 +38,7 @@

# Link Library to Dependencies
plugin_env['LIBS'].append('mapnik')
plugin_env['LIBS'].append('boost_system%s' % env['BOOST_APPEND'])
plugin_env['LIBS'].append(env['ICU_LIB_NAME'])

if env['RUNTIME_LINK'] == 'static':
Expand Down
1 change: 1 addition & 0 deletions plugins/input/kismet/build.py
Expand Up @@ -37,6 +37,7 @@
# Link Library to Dependencies
libraries.append('mapnik')
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_system%s' % env['BOOST_APPEND'])
if env['THREADING'] == 'multi':
libraries.append('boost_thread%s' % env['BOOST_APPEND'])

Expand Down
1 change: 1 addition & 0 deletions plugins/input/occi/build.py
Expand Up @@ -38,6 +38,7 @@

libraries = [ 'occi', 'ociei' ]
libraries.append('mapnik')
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append(env['ICU_LIB_NAME'])

input_plugin = plugin_env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS'])
Expand Down
1 change: 1 addition & 0 deletions plugins/input/postgis/build.py
Expand Up @@ -38,6 +38,7 @@

# Link Library to Dependencies
plugin_env['LIBS'].append('mapnik')
plugin_env['LIBS'].append('boost_system%s' % env['BOOST_APPEND'])
plugin_env['LIBS'].append(env['ICU_LIB_NAME'])
if env['THREADING'] == 'multi':
plugin_env['LIBS'].append('boost_thread%s' % env['BOOST_APPEND'])
Expand Down

0 comments on commit b44a63a

Please sign in to comment.