diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-text/sword/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-text/sword/files')
-rw-r--r-- | app-text/sword/files/sword-1.7.4-configure.patch | 23 | ||||
-rw-r--r-- | app-text/sword/files/sword-1.7.4-gcc6.patch | 22 |
2 files changed, 45 insertions, 0 deletions
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch new file mode 100644 index 000000000000..a098addcd0d2 --- /dev/null +++ b/app-text/sword/files/sword-1.7.4-configure.patch @@ -0,0 +1,23 @@ +--- a/configure ++++ b/configure +@@ -16893,7 +16895,7 @@ + # --------------------------------------------------------------------- + + # NOTE the $libdir hack at the end of the c[xx]flags. Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/ ++if test "x$with_clucene" != "xno"; then +-with_clucene=no + if test "x$CLUCENE2_LIBS" != x; then + echo "clucene 2.x found - lucene searching options available" + AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir" +@@ -16914,6 +16912,11 @@ + echo "lucene searching options not available" + fi + fi ++else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5 ++$as_echo "clucene manually disabled - excluding support" >&6; } ++with_clucene="no" ++fi + + for ac_func in vsnprintf + do : 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" |