[SCM] mapnik branch, master, updated. debian/2.0.0+ds1-3-82-gd9464ef

Jérémy Lal kapouer at melix.org
Fri Aug 30 11:05:09 UTC 2013


The following commit has been merged in the master branch:
commit eeaad2a05badbedb5cbf75fd7b6689ac8fedacdb
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Aug 30 13:04:18 2013 +0200

    Update 1001 patch to match upstream pull request

diff --git a/debian/patches/1001_ldl.patch b/debian/patches/1001_ldl.patch
index 9add136..3ae31f7 100644
--- a/debian/patches/1001_ldl.patch
+++ b/debian/patches/1001_ldl.patch
@@ -1,15 +1,14 @@
 Description: link mapnik against dl
 Author: Jérémy Lal <kapouer at melix.org>
-Forwarded: not yet
-Last-Update: 2013-08-29
+Forwarded: https://github.com/mapnik/mapnik/pull/1998
+Last-Update: 2013-08-30
 --- a/src/build.py
 +++ b/src/build.py
-@@ -57,7 +57,7 @@
- system = 'boost_system%s' % env['BOOST_APPEND']
+@@ -106,6 +106,7 @@
+             mapnik_lib_link_flag += ' -Wl,-h,%s' %  mapnik_libname
+     else: # Linux and others
+         mapnik_lib_link_flag += ' -Wl,-rpath-link,. -Wl,-soname,%s' % mapnik_libname
++	lib_env['LIBS'].append('dl')
  
- # clear out and re-set libs for this env
--lib_env['LIBS'] = ['freetype','z',env['ICU_LIB_NAME'],filesystem,system,regex]
-+lib_env['LIBS'] = ['freetype','z',env['ICU_LIB_NAME'],filesystem,system,regex,'dl']
- 
- if env['PROJ']:
-    lib_env['LIBS'].append('proj')
+ source = Split(
+     """

-- 
C++/Python toolkit for developing GIS applications



More information about the Pkg-grass-devel mailing list