sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082

Browse source
This commit is contained in:
Dane Springmeyer 2014-01-27 12:24:20 -08:00
parent 587a1c1bff
commit 777e067770
4 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/input/ogr/build.py
View file

@ -48,13 +48,6 @@ if env['RUNTIME_LINK'] == 'static':
plugin_env.Append(LIBS=env['PLUGINS']['ogr']['lib']) plugin_env.Append(LIBS=env['PLUGINS']['ogr']['lib'])
libraries = copy(plugin_env['LIBS']) libraries = copy(plugin_env['LIBS'])
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
cxxflags.append('-fpermissive')
plugin_env.Append(CXXFLAGS=cxxflags) plugin_env.Append(CXXFLAGS=cxxflags)
if env['PLUGIN_LINKING'] == 'shared': if env['PLUGIN_LINKING'] == 'shared':

7
plugins/input/shape/build.py
View file

@ -45,13 +45,6 @@ libraries.append('boost_system%s' % env['BOOST_APPEND'])
cppdefines = [] cppdefines = []
cxxflags = [] cxxflags = []
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
cxxflags.append('-fpermissive')
plugin_env.Append(CXXFLAGS=cxxflags) plugin_env.Append(CXXFLAGS=cxxflags)
plugin_env.Append(CPPDEFINES=cppdefines) plugin_env.Append(CPPDEFINES=cppdefines)

14
src/build.py
View file

@ -362,20 +362,6 @@ if env['SVG_RENDERER']: # svg backend
lib_env.Append(CPPDEFINES = '-DSVG_RENDERER') lib_env.Append(CPPDEFINES = '-DSVG_RENDERER')
libmapnik_defines.append('-DSVG_RENDERER') libmapnik_defines.append('-DSVG_RENDERER')
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/1001
env4 = lib_env.Clone()
env4.Append(CXXFLAGS = '-fpermissive')
cpp ='mapped_memory_cache.cpp'
source.remove(cpp)
if env['LINKING'] == 'static':
source.insert(0,env4.StaticObject(cpp))
else:
source.insert(0,env4.SharedObject(cpp))
if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']: if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
source += Split( source += Split(
""" """

7
utils/shapeindex/build.py
View file

@ -45,13 +45,6 @@ if env['RUNTIME_LINK'] == 'static':
if env['PLATFORM'] == 'Linux': if env['PLATFORM'] == 'Linux':
libraries.append('dl') libraries.append('dl')
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
program_env.Append(CXXFLAGS = '-fpermissive')
shapeindex = program_env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries) shapeindex = program_env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries)
Depends(shapeindex, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) Depends(shapeindex, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))