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

gdal-config - use both --libs and --dep-libs when RUNTIME_LINK

Browse source 
+ `ogr.input` needs `pkg-config libpq --libs --static`
This commit is contained in:
Artem Pavlenko 2024-04-03 18:18:13 +01:00
parent 83f833f1ce
commit c2c6d2ed60
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,9 +38,10 @@ plugin_env['LIBS'] = []
plugin_env.Append(LIBS=env['PLUGINS']['gdal']['lib']) plugin_env.Append(LIBS=env['PLUGINS']['gdal']['lib'])
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
cmd = '%s --dep-libs' % plugin_env['GDAL_CONFIG'] cmd = '%s --libs --dep-libs' % plugin_env['GDAL_CONFIG']
plugin_env.ParseConfig(cmd) plugin_env.ParseConfig(cmd)
# Link Library to Dependencies # Link Library to Dependencies
libraries = copy(plugin_env['LIBS']) libraries = copy(plugin_env['LIBS'])

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

@ -43,8 +43,14 @@ plugin_env['LIBS'] = []
plugin_env.Append(LIBS=env['PLUGINS']['ogr']['lib']) plugin_env.Append(LIBS=env['PLUGINS']['ogr']['lib'])
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
cmd = '%s --dep-libs' % plugin_env['GDAL_CONFIG'] cmd = '%s --libs --dep-libs' % plugin_env['GDAL_CONFIG']
plugin_env.ParseConfig(cmd) plugin_env.ParseConfig(cmd)
cmd = 'pkg-config libpq --libs --static'
try:
plugin_env.ParseConfig(cmd)
except:
pass
# Link Library to Dependencies # Link Library to Dependencies
libraries = copy(plugin_env['LIBS']) libraries = copy(plugin_env['LIBS'])