1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
Author: Gert Wollny <gw.fossdev@debian.org>
Last-Update: Tue, 10 May 2016
Bug: https://bugs.debian.org/811944
Forwarded-Upstream: no
Description: Remove all instances of -ftemplate-depth
With C++-11 the template depth is 1024, and g++ defaults to 900,
hence there is no need to set a lower value that makes the
compilation fail.
--- a/libs/phylogeny/tests/Makefile
+++ b/libs/phylogeny/tests/Makefile
@@ -1,5 +1,5 @@
-CPPFLAGS= -g -Wall -Wno-sign-compare -I.. -DLOG -ftemplate-depth-25 -O0
-CPPFLAGSDEBUG= -g -Wall -Wno-sign-compare -I.. -DLOG -ftemplate-depth-32
+CPPFLAGS= -g -Wall -Wno-sign-compare -I.. -DLOG -O0
+CPPFLAGSDEBUG= -g -Wall -Wno-sign-compare -I.. -DLOG
# -O3
LDFLAGS= -L..
---- programs/Makefile.generic
-+++ programs/Makefile.generic
-@@ -53,8 +53,8 @@
-
- .SECONDARY: $(addsuffix _cmdline.c,$(EXEC)) $(addsuffix _cmdline.h,$(EXEC)) $(addsuffix .ggo,$(EXEC))
-
--CPPFLAGS= -O3 -Wall -Wno-sign-compare -I. -I$(libDir) -DLOG -ftemplate-depth-32
--CPPFLAGSDEBUG= -g -Wall -Wno-sign-compare -I. -I$(libDir) -DLOG -ftemplate-depth-32
-+CPPFLAGS= -O3 -Wall -Wno-sign-compare -I. -I$(libDir) -DLOG
-+CPPFLAGSDEBUG= -g -Wall -Wno-sign-compare -I. -I$(libDir) -DLOG
-
- LDFLAGSDEBUG := $(LDFLAGS) -g
- # sources
-@@ -197,7 +197,7 @@
- echo $(LIB)
-
-
--%.debug: CPPFLAGS = -g -Wall -Wno-sign-compare -I. -I../.. -DLOG -ftemplate-depth-25
-+%.debug: CPPFLAGS = -g -Wall -Wno-sign-compare -I. -I../.. -DLOG
-
- %.debug: %.o
-
|