[SCM] mapnik branch, master, updated. debian/2.2.0+ds1-4-4-gb0a818a

Jérémy Lal kapouer at melix.org
Sat Oct 12 15:25:44 UTC 2013


The following commit has been merged in the master branch:
commit d387ac906a5ab25d2c7f7e5f7ce65dde9f24532e
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Oct 12 16:24:27 2013 +0200

    Add 2001 patch

diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
new file mode 100644
index 0000000..6ab370d
--- /dev/null
+++ b/debian/patches/2001_ftemplate-depth.patch
@@ -0,0 +1,16 @@
+Description: remove gcc ftemplate-depth-300 flag
+ it can use a lot of memory, and default value works on debian
+Forwarded: not-needed, https://github.com/mapnik/mapnik/commit/b01b21f24
+Author: Jérémy Lal <kapouer at melix.org>
+Last-Update: 2013-10-12
+--- a/SConstruct
++++ b/SConstruct
+@@ -1659,7 +1659,7 @@
+         if not env['SUNCC']:
+ 
+             # Common flags for CXX compiler.
+-            common_cxx_flags = '-ansi -Wall %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
++            common_cxx_flags = '-ansi -Wall %s %s ' % (env['WARNING_CXXFLAGS'], pthread)
+ 
+             # https://github.com/mapnik/mapnik/issues/1835
+             if sys.platform == 'darwin' and env['CXX'] == 'g++':

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



More information about the Pkg-grass-devel mailing list