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

try again to fix pgsql2sqlite linking on linux

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-28 13:40:58 -08:00
parent f0936f2672
commit def040a42d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
utils/pgsql2sqlite/build.py
View file

@ -56,9 +56,8 @@ if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_system = 'boost_system%s' % env['BOOST_APPEND'] boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries.extend([boost_system]) libraries.extend([boost_system])
linkflags = env['CUSTOM_LDFLAGS']
if env['SQLITE_LINKFLAGS']: if env['SQLITE_LINKFLAGS']:
linkflags.append(env['SQLITE_LINKFLAGS']) program_env.Append(LINKFLAGS=env['SQLITE_LINKFLAGS'])
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
@ -68,7 +67,7 @@ if env['RUNTIME_LINK'] == 'static':
program_env.ParseConfig('pg_config --libs') program_env.ParseConfig('pg_config --libs')
libraries.append('dl') libraries.append('dl')
pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries, LINKFLAGS=linkflags) pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries)
Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
if 'uninstall' not in COMMAND_LINE_TARGETS: if 'uninstall' not in COMMAND_LINE_TARGETS: