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

always link libdl on linux - needed on some systems after #1804 - closes #1998

Browse source
This commit is contained in:
Dane Springmeyer 2013-09-01 22:02:52 -07:00
parent 5e322dbff2
commit 02f2fbdf8b
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/build.py
View file

@ -95,8 +95,6 @@ if '-DBOOST_REGEX_HAS_ICU' in env['CPPDEFINES']:
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
if 'icuuc' in env['ICU_LIB_NAME']: if 'icuuc' in env['ICU_LIB_NAME']:
lib_env['LIBS'].append('icudata') lib_env['LIBS'].append('icudata')
if env['PLATFORM'] == 'Linux':
lib_env['LIBS'].append('dl')
else: else:
lib_env['LIBS'].insert(0, 'agg') lib_env['LIBS'].insert(0, 'agg')
@ -117,6 +115,7 @@ else: # unix, non-macos
else: else:
mapnik_lib_link_flag += ' -Wl,-h,%s' % mapnik_libname mapnik_lib_link_flag += ' -Wl,-h,%s' % mapnik_libname
else: # Linux and others else: # Linux and others
lib_env['LIBS'].append('dl')
mapnik_lib_link_flag += ' -Wl,-rpath-link,. -Wl,-soname,%s' % mapnik_libname mapnik_lib_link_flag += ' -Wl,-rpath-link,. -Wl,-soname,%s' % mapnik_libname
source = Split( source = Split(