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

fix datasource plug-ins linking order

Browse source
This commit is contained in:
Artem Pavlenko 2018-03-13 12:54:18 +01:00
parent 47285d1dcf
commit 51057d2106
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/input/csv/build.py
View file

@ -36,7 +36,7 @@ else:
PLUGIN_NAME = 'csv'
plugin_env = plugin_base.Clone()
#plugin_env[LINKFLAGS] = '-lmapnik' + plugin_env[LINKFLAGS]
plugin_env['SHLINKCOM'] = '$SHLINK -o $TARGET $SOURCES $SHLINKFLAGS $__SHLIBVERSIONFLAGS $__RPATH $_LIBDIRFLAGS $_LIBFLAGS'
plugin_sources = Split(
"""
%(PLUGIN_NAME)s_utils.cpp

1
plugins/input/pgraster/build.py
View file

@ -26,6 +26,7 @@ from copy import copy
PLUGIN_NAME = 'pgraster'
plugin_env = plugin_base.Clone()
plugin_env['SHLINKCOM'] = '$SHLINK -o $TARGET $SOURCES $SHLINKFLAGS $__SHLIBVERSIONFLAGS $__RPATH $_LIBDIRFLAGS $_LIBFLAGS'
plugin_sources = Split(
"""

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

@ -26,7 +26,7 @@ from copy import copy
PLUGIN_NAME = 'postgis'
plugin_env = plugin_base.Clone()
plugin_env['SHLINKCOM'] = '$SHLINK -o $TARGET $SOURCES $SHLINKFLAGS $__SHLIBVERSIONFLAGS $__RPATH $_LIBDIRFLAGS $_LIBFLAGS'
plugin_sources = Split(
"""
%(PLUGIN_NAME)s_datasource.cpp
@ -54,7 +54,6 @@ if env['PLUGIN_LINKING'] == 'shared':
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.insert(0,env['MAPNIK_NAME'])
libraries.append(env['ICU_LIB_NAME'])
TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
SHLIBPREFIX='',
SHLIBSUFFIX='.input',

4
plugins/input/sqlite/build.py
View file

@ -25,7 +25,7 @@ Import ('env')
PLUGIN_NAME = 'sqlite'
plugin_env = plugin_base.Clone()
plugin_env['SHLINKCOM'] = '$SHLINK -o $TARGET $SOURCES $SHLINKFLAGS $__SHLIBVERSIONFLAGS $__RPATH $_LIBDIRFLAGS $_LIBFLAGS'
plugin_sources = Split(
"""
%(PLUGIN_NAME)s_datasource.cpp
@ -44,9 +44,7 @@ if env['SQLITE_LINKFLAGS']:
if env['PLUGIN_LINKING'] == 'shared':
libraries.append('boost_system%s' % env['BOOST_APPEND'])
#libraries.insert(0,env['MAPNIK_NAME'])
libraries.append(env['ICU_LIB_NAME'])
TARGET = plugin_env.SharedLibrary('../%s' % PLUGIN_NAME,
SHLIBPREFIX='',
SHLIBSUFFIX='.input',