commit: 62998f5c488eb5b68c6fa8769db4be17bef1d262
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 17:54:32 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 20 17:56:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62998f5c
dev-cpp/clucene: Fix build with gcc-6
Revision bump adds pending upstream patch which fixes build with gcc-6.
Gentoo-bug: 582868
Thanks-to: Peter Levine <plevine457 <AT> gmail.com>
Package-Manager: portage-2.3.0_rc1
dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild | 64 ++++++++++++++++++++++++
dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch | 25 +++++++++
2 files changed, 89 insertions(+)
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
new file mode 100644
index 0000000..625ea05
--- /dev/null
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN}"-core
+MY_P="${MY_PN}"-"${PV}"
+
+inherit cmake-utils multilib
+
+DESCRIPTION="High-performance, full-featured text search engine based off of
lucene in C++"
+HOMEPAGE="http://clucene.sourceforge.net/";
+SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="debug doc static-libs"
+
+DEPEND="
+ doc? ( >=app-doc/doxygen-1.4.2 )
+"
+RDEPEND="!<app-misc/strigi-0.7.5-r3"
+
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog README README.PACKAGE REQUESTS)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-contrib.patch"
+ "${FILESDIR}/${P}-pkgconfig.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+)
+
+src_prepare() {
+ default
+
+ # patch out installing bundled boost headers, we build against system
one
+ sed -i \
+ -e '/ADD_SUBDIRECTORY (src\/ext)/d' \
+ CMakeLists.txt || die
+ rm -rf src/ext || die
+}
+
+src_configure() {
+ # Disabled threads: see upstream bug
+ #
https://sourceforge.net/tracker/?func=detail&aid=3237301&group_id=80013&atid=558446
+ local mycmakeargs=(
+ -DENABLE_ASCII_MODE=OFF
+ -DENABLE_PACKAGING=OFF
+ -DDISABLE_MULTITHREADING=OFF
+ -DBUILD_CONTRIBS_LIB=ON
+ "-DLIB_DESTINATION=${EPREFIX}/usr/$(get_libdir)"
+ -DENABLE_DEBUG=$(usex debug)
+ -DENABLE_CLDOCS=$(usex doc)
+ -DBUILD_STATIC_LIBRARIES=$(usex static-libs)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
b/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
new file mode 100644
index 0000000..54be526
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
@@ -0,0 +1,25 @@
+From b5a1b3488a72abd250cbd5d4dfbeac3e3739c237 Mon Sep 17 00:00:00 2001
+From: Hodorgasm <[email protected]>
+Date: Thu, 12 May 2016 20:38:12 -0400
+Subject: [PATCH] Support GCC-6
+
+---
+ src/shared/cmake/MacroCheckGccVisibility.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/cmake/MacroCheckGccVisibility.cmake
b/src/shared/cmake/MacroCheckGccVisibility.cmake
+index 2022aa3..020f913 100644
+--- a/src/shared/cmake/MacroCheckGccVisibility.cmake
++++ b/src/shared/cmake/MacroCheckGccVisibility.cmake
+@@ -15,7 +15,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisibility)
+ # get the gcc version
+ exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE
_gcc_version_info)
+
+- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version
"${_gcc_version_info}")
++ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version
"${_gcc_version_info}")
+ if (NOT _gcc_version)
+
+ # clang reports: clang version 1.1 (trunk 95754)
+--
+2.8.2
+
