summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2016-10-24 20:42:52 -0400
committerChris Reffett <creffett@gentoo.org>2016-10-24 20:43:51 -0400
commitea26c138a5a7b151457852959532d6ddac9f0945 (patch)
tree7e4d5a8d92f22da6f87673c9b946dc7f5fe4f4ea /app-text/sword
parentdev-lang/rust-bin: remove older versions (diff)
downloadgentoo-ea26c138a5a7b151457852959532d6ddac9f0945.tar.gz
gentoo-ea26c138a5a7b151457852959532d6ddac9f0945.tar.bz2
gentoo-ea26c138a5a7b151457852959532d6ddac9f0945.zip
app-text/sword: Add patch for building with GCC 6
Gentoo-Bug: 593818 Package-Manager: portage-2.3.2
Diffstat (limited to 'app-text/sword')
-rw-r--r--app-text/sword/files/sword-1.7.4-gcc6.patch22
-rw-r--r--app-text/sword/sword-1.7.4.ebuild3
2 files changed, 24 insertions, 1 deletions
diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
new file mode 100644
index 000000000000..54c79671235e
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-gcc6.patch
@@ -0,0 +1,22 @@
+--- sword-1.7.4/configure.ac.old 2016-09-21 18:04:55.029088352 -0400
++++ sword-1.7.4/configure.ac 2016-09-21 18:05:37.870349308 -0400
+@@ -197,7 +197,7 @@
+ fi
+
+
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+
+ if test x$enable_warnings = xyes; then
+ AM_CFLAGS="$AM_CFLAGS -Werror"
+--- sword-1.7.4/configure.old 2016-09-21 18:05:05.900008373 -0400
++++ sword-1.7.4/configure 2016-09-21 18:06:03.822112657 -0400
+@@ -16793,7 +16793,7 @@
+ fi
+
+
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+
+ if test x$enable_warnings = xyes; then
+ AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
index 1567283b4ed6..3943b6faa6ec 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -39,6 +39,7 @@ src_prepare() {
[Install]
DataPath=${EPREFIX}/usr/share/${PN}/
EOF
+ epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
}
src_configure() {