[sword-devel] [PATCH] raise template_depth to allow build with gcc 5.0
Matěj Cepl
mcepl at cepl.eu
Thu Feb 12 05:19:17 MST 2015
Hi,
I have asked my colleagues who actually know something about C++ (which
is a big difference from me), and their conclusion was that what we need
is just to raise template_depth. Apparently, the default is 25 which is
just a way too little for your construct.
With the attached patch xiphos builds in Rawhide (the scratch build is
http://koji.fedoraproject.org/koji/taskinfo?taskID=8907208 ).
Blessings,
Matěj
---
xiphos.spec | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/xiphos.spec b/xiphos.spec
index 2a60104..aad1ff8 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -5,9 +5,9 @@
%define build3 1
%endif
-Name: xiphos
+Name: xiphos
Version: 4.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -91,6 +91,7 @@ mkdir gtk3
cp -r gtk2/* gtk3
%build
+CXXFLAGS="$CXXFLAGS -ftemplate-depth=128"
%ifarch %{power64}
CFLAGS="$CFLAGS -D__SANE_USERSPACE_TYPES__"
CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__"
@@ -210,6 +211,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Thu Feb 12 2015 Matej Cepl <mcepl at redhat.com> - 4.0.0-5
+- raise template_depth to allow build with gcc 5.0
+
* Fri Jan 16 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.0-4
- Added GTK compat so that we can link against GTK2 all the way
@@ -350,7 +354,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Update to 2.3.6
* Thu Jul 24 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.5-2
-- Bump EVR
+- Bump EVR
* Thu Jul 03 2008 Deji Akingunola <dakingun at gmail.com> - 2.3.5-1
- Update to 2.3.5
@@ -440,7 +444,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Fix Build requires
* Wed Nov 08 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.8-1
-- Update to new (unstable) version
+- Update to new (unstable) version
* Wed Sep 20 2006 Deji Akingunola <dakingun at gmail.com> - 2.1.6-4
- Add perl(XML::Parser) to the BRs
--
1.8.3.1
More information about the sword-devel
mailing list