From c2728353350bb73eba659ea17b73d75e6773d2d1 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 14 Feb 2012 12:03:44 -0800 Subject: [PATCH] yet another -fpermissive - refs #1082, #950 and #1001 --- utils/shapeindex/build.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/shapeindex/build.py b/utils/shapeindex/build.py index 4a4b66881..24b393465 100644 --- a/utils/shapeindex/build.py +++ b/utils/shapeindex/build.py @@ -41,6 +41,13 @@ boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] boost_system = 'boost_system%s' % env['BOOST_APPEND'] libraries = [boost_program_options, boost_filesystem, boost_system] +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, LINKFLAGS=env['CUSTOM_LDFLAGS']) Depends(shapeindex, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))