public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/
Date: Mon, 21 Jan 2019 19:20:58 +0000 (UTC)	[thread overview]
Message-ID: <1548098408.59d71e2c5d1c835eda84c1647a52687dec3f38b6.graaff@gentoo> (raw)

commit:     59d71e2c5d1c835eda84c1647a52687dec3f38b6
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 19:20:08 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 19:20:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d71e2c

app-misc/sphinx: link against libre2 shared library

Explicitly provide the shared object to link against, since the build
system defaults to a static library and can't use normal linker
commands.

Fixes: https://bugs.gentoo.org/674308
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-misc/sphinx/sphinx-2.2.11-r2.ebuild | 112 ++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)

diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
new file mode 100644
index 00000000000..ed278ee1e82
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.15
+
+inherit eutils 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 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 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 )
+	re2? ( dev-libs/re2 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
+	virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.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 libre2 || 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 re2) \
+		--with-re2-libs="${EPREFIX}/usr/$(get_libdir)/libre2.so" \
+		$(use_with stemmer libstemmer) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
+
+	cd api/libsphinxclient || die
+	econf STRIP=:
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" || die "emake failed"
+
+	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+	# Tests require a live database and only work from the source
+	# directory.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+	dodoc doc/*
+
+	dodir /var/lib/sphinx
+	dodir /var/log/sphinx
+
+	newinitd "${FILESDIR}"/searchd.rc searchd
+}


             reply	other threads:[~2019-01-21 19:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-21 19:20 Hans de Graaff [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-05  7:01 [gentoo-commits] repo/gentoo:master commit in: app-misc/sphinx/ Sam James
2024-02-09 14:24 Hans de Graaff
2022-11-14  6:42 Hans de Graaff
2022-07-28  7:10 Sam James
2022-03-26  1:37 Sam James
2022-03-20 20:49 David Seifert
2021-09-22  6:58 Agostino Sarubbo
2021-09-21  6:35 Agostino Sarubbo
2021-08-27 20:45 Sam James
2021-08-27  7:23 Hans de Graaff
2021-08-19 11:55 Agostino Sarubbo
2021-08-19  1:08 Sam James
2021-08-15  7:41 Hans de Graaff
2021-01-06 13:19 Fabian Groffen
2020-04-05  9:09 Hans de Graaff
2020-03-16  6:30 Matt Turner
2019-01-24 21:35 Sergei Trofimovich
2019-01-04 22:41 Mikle Kolyada
2019-01-01 21:19 Sergei Trofimovich
2018-12-26 20:06 Sergei Trofimovich
2018-12-26 20:04 Sergei Trofimovich
2018-12-26 13:15 Sergei Trofimovich
2018-12-26 13:15 Sergei Trofimovich
2018-07-27  5:22 Hans de Graaff
2018-07-27  5:22 Hans de Graaff
2018-07-20 18:33 Hans de Graaff
2017-12-10 14:16 David Seifert
2017-10-22  7:21 Hans de Graaff
2016-12-21 22:54 Thomas Deutschmann
2016-09-24 13:40 Agostino Sarubbo
2016-09-05 17:46 Hans de Graaff
2016-07-31  5:53 Hans de Graaff
2016-07-31  5:53 Hans de Graaff
2016-04-06 16:04 Fabian Groffen
2016-01-25 14:05 Hans de Graaff
2015-11-01 13:23 Mikle Kolyada
2015-10-27 12:18 Agostino Sarubbo
2015-10-24  8:15 Hans de Graaff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1548098408.59d71e2c5d1c835eda84c1647a52687dec3f38b6.graaff@gentoo \
    --to=graaff@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox