diff options
author | Hans de Graaff <graaff@gentoo.org> | 2021-08-15 07:38:07 +0200 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2021-08-15 09:41:13 +0200 |
commit | 2d4b7d5519ded98678c67fec32cfe250c0c96c47 (patch) | |
tree | 9e4168a690adc249a893ffc004206636d14d6e6e /app-misc | |
parent | dev-ruby/pundit: fix tests (diff) | |
download | gentoo-2d4b7d5519ded98678c67fec32cfe250c0c96c47.tar.gz gentoo-2d4b7d5519ded98678c67fec32cfe250c0c96c47.tar.bz2 gentoo-2d4b7d5519ded98678c67fec32cfe250c0c96c47.zip |
app-misc/sphinx: modernize and fix issues
Drop re2 support since sphinx requires an obsolete version of re2.
Closes: https://bugs.gentoo.org/771069
Use EAPI 8 and support automake 1.16, thanks for Andrey Volkov.
Bug: https://bugs.gentoo.org/649120
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch | 10 | ||||
-rw-r--r-- | app-misc/sphinx/sphinx-2.2.11-r3.ebuild | 111 |
2 files changed, 121 insertions, 0 deletions
diff --git a/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch new file mode 100644 index 000000000000..da556ef2ef64 --- /dev/null +++ b/app-misc/sphinx/files/sphinx-2.2.11-automake-1.16.patch @@ -0,0 +1,10 @@ +diff --git a/api/libsphinxclient/Makefile.am b/api/libsphinxclient/Makefile.am +index a4abfef..10d5914 100644 +--- a/api/libsphinxclient/Makefile.am ++++ b/api/libsphinxclient/Makefile.am +@@ -10,4 +10,4 @@ libsphinxclient_la_LIBADD = @LTLIBOBJS@ + libsphinxclient_la_LDFLAGS = -release @VERSION@ + + include_HEADERS = sphinxclient.h +-test_LDADD = .libs/libsphinxclient.a ++test_LDADD = $(lib_LTLIBRARIES) diff --git a/app-misc/sphinx/sphinx-2.2.11-r3.ebuild b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild new file mode 100644 index 000000000000..5ee036e63750 --- /dev/null +++ b/app-misc/sphinx/sphinx-2.2.11-r3.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +#MY_P=${P/_/-} +MY_P=${P}-release + +DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL" +HOMEPAGE="http://www.sphinxsearch.com/" +SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris" +IUSE="debug +id64 mariadb mysql odbc postgres stemmer syslog xml" + +REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )" + +RDEPEND=" + mysql? ( dev-db/mysql-connector-c ) + mariadb? ( dev-db/mariadb-connector-c ) + postgres? ( dev-db/postgresql:* ) + odbc? ( dev-db/unixODBC ) + stemmer? ( dev-libs/snowball-stemmer ) + xml? ( dev-libs/expat ) + virtual/libiconv" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + eapply -p0 "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch + eapply "${FILESDIR}"/${P}-automake-1.16.patch + + # drop nasty hardcoded search path breaking Prefix + # We patch configure directly since otherwise we need to run + # eautoreconf twice and that causes problems, bug 425380 + sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die + + if use mariadb ; then + sed -i -e 's/mysql_config/mariadb_config/g' configure || die + fi + + # Fix QA compilation warnings. + sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die + + eapply_user + + pushd api/libsphinxclient || die + eautoreconf + popd || die + + # Drop bundled code to ensure building against system versions. We + # cannot remove libstemmer_c since configure updates its Makefile. + rm -rf libexpat || die +} + +src_configure() { + # fix libiconv detection + use !elibc_glibc && export ac_cv_search_iconv=-liconv + + local mysql_with + if use mysql || use mariadb ; then + mysql_with="--with-mysql" + else + mysql_with="--without-mysql" + fi + + econf \ + --sysconfdir="${EPREFIX}/etc/${PN}" \ + $(use_enable id64) \ + $(use_with debug) \ + ${mysql_with} \ + $(use_with odbc unixodbc) \ + $(use_with postgres pgsql) \ + $(use_with stemmer libstemmer) \ + $(use_with syslog syslog) \ + $(use_with xml libexpat ) + + cd api/libsphinxclient || die + econf STRIP=: +} + +src_compile() { + emake AR="$(tc-getAR)" + + emake -j 1 -C api/libsphinxclient +} + +src_test() { + # Tests require a live database and only work from the source + # directory. + : +} + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" -C api/libsphinxclient install + + # Remove unneeded empty directories. + rmdir "${D}"/var/lib/{data,log} + + dodoc doc/* + + keepdir /var/lib/sphinx + keepdir /var/log/sphinx + + newinitd "${FILESDIR}"/searchd.rc searchd +} |