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

Merge branch 'master' into c++11

Browse source
This commit is contained in:
artemp 2013-09-02 09:50:59 +01:00
commit 4ea16b596e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
INSTALL.md
View file

@ -79,6 +79,7 @@ Additional optional dependencies:
* libsqlite3 - SQLite input (needs RTree support builtin) (sqlite plugin support) * libsqlite3 - SQLite input (needs RTree support builtin) (sqlite plugin support)
* libocci - Oracle input plugin support * libocci - Oracle input plugin support
* libcurl - OSM input plugin support * libcurl - OSM input plugin support
* librasterlite - Rasterlite input plugin support
Instructions for installing many of these dependencies on Instructions for installing many of these dependencies on
various platforms can be found at the Mapnik Wiki: various platforms can be found at the Mapnik Wiki:

3
src/build.py
View file

@ -98,8 +98,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')
@ -120,6 +118,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(