[mapnik] 02/06: Restore ftemplate-depth patch

Jérémy Lal kapouer at moszumanska.debian.org
Fri Jun 19 16:31:27 UTC 2015


This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit 98885669cbd836b1ab1029187b4de7b715624718
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Jun 13 17:38:38 2015 +0200

    Restore ftemplate-depth patch
---
 debian/patches/2001_ftemplate-depth.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
new file mode 100644
index 0000000..71e3918
--- /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
+@@ -1733,7 +1733,7 @@
+ 
+         # Common flags for g++/clang++ CXX compiler.
+         # TODO: clean up code more to make -Wsign-conversion -Wconversion -Wshadow viable
+-        common_cxx_flags = '-Wall -Wsign-compare %s %s -ftemplate-depth-300 ' % (env['WARNING_CXXFLAGS'], pthread)
++        common_cxx_flags = '-Wall -Wsign-compare %s %s ' % (env['WARNING_CXXFLAGS'], pthread)
+ 
+         # https://github.com/mapnik/mapnik/issues/1835
+         if sys.platform == 'darwin' and env['CXX'] == 'g++':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git



More information about the Pkg-grass-devel mailing list