From 73dede9954271aec6fbdaeab4e0cb6452a0ec50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= Date: Thu, 29 Aug 2013 16:52:39 +0200 Subject: [PATCH 1/2] Additional optional dependency on librasterlite --- INSTALL.md | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL.md b/INSTALL.md index e7b2aeddd..04e9ecaf9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -79,6 +79,7 @@ Additional optional dependencies: * libsqlite3 - SQLite input (needs RTree support builtin) (sqlite plugin support) * libocci - Oracle input plugin support * libcurl - OSM input plugin support + * librasterlite - Rasterlite input plugin support Instructions for installing many of these dependencies on various platforms can be found at the Mapnik Wiki: From 02f2fbdf8bc100d1fed90def0ac313ba81af9df4 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 1 Sep 2013 22:02:52 -0700 Subject: [PATCH 2/2] always link libdl on linux - needed on some systems after #1804 - closes #1998 --- src/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/build.py b/src/build.py index a15d2a464..0dba64a0e 100644 --- a/src/build.py +++ b/src/build.py @@ -95,8 +95,6 @@ if '-DBOOST_REGEX_HAS_ICU' in env['CPPDEFINES']: if env['RUNTIME_LINK'] == 'static': if 'icuuc' in env['ICU_LIB_NAME']: lib_env['LIBS'].append('icudata') - if env['PLATFORM'] == 'Linux': - lib_env['LIBS'].append('dl') else: lib_env['LIBS'].insert(0, 'agg') @@ -117,6 +115,7 @@ else: # unix, non-macos else: mapnik_lib_link_flag += ' -Wl,-h,%s' % mapnik_libname else: # Linux and others + lib_env['LIBS'].append('dl') mapnik_lib_link_flag += ' -Wl,-rpath-link,. -Wl,-soname,%s' % mapnik_libname source = Split(