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

fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123

Browse source
This commit is contained in:
Dane Springmeyer 2014-02-27 14:23:57 -08:00
parent 0fbcc12678
commit 871b17f5d9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/input/postgis/build.py
View file

@ -21,6 +21,7 @@
Import ('plugin_base') Import ('plugin_base')
Import ('env') Import ('env')
from copy import copy
PLUGIN_NAME = 'postgis' PLUGIN_NAME = 'postgis'
@ -34,9 +35,8 @@ plugin_sources = Split(
) )
# Link Library to Dependencies # Link Library to Dependencies
plugin_env['LIBS'] = []
libraries = ['pq'] libraries = ['pq']
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append(env['ICU_LIB_NAME'])
#if env['THREADING'] == 'multi': #if env['THREADING'] == 'multi':
# libraries.append('boost_thread%s' % env['BOOST_APPEND']) # libraries.append('boost_thread%s' % env['BOOST_APPEND'])
@ -49,9 +49,13 @@ if env['RUNTIME_LINK'] == 'static':
else: else:
# TODO - parse back into libraries variable # TODO - parse back into libraries variable
plugin_env.ParseConfig('pg_config --libs') plugin_env.ParseConfig('pg_config --libs')
if plugin_env['LIBS']:
libraries.extend(copy(plugin_env['LIBS']))
if env['PLUGIN_LINKING'] == 'shared': if env['PLUGIN_LINKING'] == 'shared':
libraries.append('mapnik') libraries.insert(0,'mapnik')
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_system%s' % env['BOOST_APPEND'])
TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME, TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
SHLIBPREFIX='', SHLIBPREFIX='',