Skip to content

Commit

Permalink
add permissive flag to ogr and shape plugins to work around boost int…
Browse files Browse the repository at this point in the history
…erprocess compile bug - closes #1082 - refs #950 and #1001
  • Loading branch information
Dane Springmeyer committed Feb 14, 2012
1 parent 9d5591b commit e2d398f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions plugins/input/ogr/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@
plugin_env.ParseConfig(cmd)
plugin_env['LIBS'].append('proj')

if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
if boost_version_from_header < 46:
# avoid ubuntu issue with boost interprocess:
# https://github.com/mapnik/mapnik/issues/1082
plugin_env.Append(CXXFLAGS = '-fpermissive')

input_plugin = plugin_env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LINKFLAGS=env['CUSTOM_LDFLAGS'])

# if the plugin links to libmapnik ensure it is built first
Expand Down
7 changes: 7 additions & 0 deletions plugins/input/shape/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@
if env['SHAPE_MEMORY_MAPPED_FILE']:
plugin_env.Append(CXXFLAGS = '-DSHAPE_MEMORY_MAPPED_FILE')

if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
if boost_version_from_header < 46:
# avoid ubuntu issue with boost interprocess:
# https://github.com/mapnik/mapnik/issues/1082
plugin_env.Append(CXXFLAGS = '-fpermissive')

input_plugin = plugin_env.SharedLibrary('../shape', SHLIBSUFFIX='.input', source=shape_src, SHLIBPREFIX='', LIBS = libraries, LINKFLAGS=env['CUSTOM_LDFLAGS'])

# if the plugin links to libmapnik ensure it is built first
Expand Down

0 comments on commit e2d398f

Please sign in to comment.