diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2011-12-17 18:51:08 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2011-12-17 18:51:08 +0000 |
| commit | 189e51d54ab1ccb79e85fa96a847d552cc82c069 (patch) | |
| tree | a42786ab5a55dde928b63284180fa5effea051c5 /dev-libs/xapian-bindings | |
| parent | alpha/ia64/sparc stable wrt #392785 (diff) | |
| download | gentoo-2-189e51d54ab1ccb79e85fa96a847d552cc82c069.tar.gz gentoo-2-189e51d54ab1ccb79e85fa96a847d552cc82c069.tar.bz2 gentoo-2-189e51d54ab1ccb79e85fa96a847d552cc82c069.zip | |
Fix install location of lua binding
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/xapian-bindings')
| -rw-r--r-- | dev-libs/xapian-bindings/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch | 26 | ||||
| -rw-r--r-- | dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild | 13 |
3 files changed, 42 insertions, 3 deletions
diff --git a/dev-libs/xapian-bindings/ChangeLog b/dev-libs/xapian-bindings/ChangeLog index 15a9d07b13fc..aa82fa34ec68 100644 --- a/dev-libs/xapian-bindings/ChangeLog +++ b/dev-libs/xapian-bindings/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xapian-bindings # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.26 2011/12/14 11:21:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/ChangeLog,v 1.27 2011/12/17 18:51:08 blueness Exp $ + + 17 Dec 2011; Anthony G. Basile <blueness@gentoo.org> + xapian-bindings-1.2.8.ebuild, +files/fix-LUA_LIB-envvar.patch: + Fix install location of lua binding *xapian-bindings-1.2.8 (14 Dec 2011) diff --git a/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch b/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch new file mode 100644 index 000000000000..7f6ea76c2233 --- /dev/null +++ b/dev-libs/xapian-bindings/files/fix-LUA_LIB-envvar.patch @@ -0,0 +1,26 @@ +diff -Naur xapian-bindings-1.2.8.orig//configure.ac xapian-bindings-1.2.8/configure.ac +--- xapian-bindings-1.2.8.orig//configure.ac 2011-12-14 00:29:23.000000000 -0500 ++++ xapian-bindings-1.2.8/configure.ac 2011-12-17 13:28:25.000000000 -0500 +@@ -926,13 +926,15 @@ + if test -n "$LUA" ; then + AC_MSG_RESULT([$lua_version]) + AC_ARG_VAR(LUA_LIB, [Directory to install xapian.so into]) +- AC_MSG_CHECKING(for Lua library to install xapian.so) +- LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'` +- LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'` +- if test -z "$LUA_LIB"; then +- AC_MSG_RESULT(not found) +- else +- AC_MSG_RESULT($LUA_LIB) ++ if test -z "$LUA_LIB" ; then ++ AC_MSG_CHECKING([for Lua library to install xapian.so]) ++ LUA_LIB=`$LUA -e 'require("package") print(package.cpath)' | cut -f 2 -d ';' | cut -f 1 -d '?'` ++ LUA_LIB=`expr X"$LUA_LIB" : X'\(.*\)/$'` ++ if test -z "$LUA_LIB"; then ++ AC_MSG_RESULT(not found) ++ else ++ AC_MSG_RESULT($LUA_LIB) ++ fi + fi + AC_SUBST(LUA_LIB) + diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild index 44987c3915f9..f14ce3896366 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.1 2011/12/14 11:21:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.8.ebuild,v 1.2 2011/12/17 18:51:08 blueness Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -12,7 +12,7 @@ PHP_EXT_NAME="xapian" PHP_EXT_INI="yes" PHP_EXT_OPTIONAL_USE="php" -inherit java-pkg-opt-2 mono php-ext-source-r2 python +inherit java-pkg-opt-2 mono php-ext-source-r2 python autotools DESCRIPTION="SWIG and JNI bindings for Xapian" HOMEPAGE="http://www.xapian.org/" @@ -43,6 +43,11 @@ pkg_setup() { } src_prepare() { + if use lua; then + epatch "${FILESDIR}"/fix-LUA_LIB-envvar.patch + eautoreconf + fi + java-pkg-opt-2_src_prepare if use java; then sed \ @@ -68,6 +73,10 @@ src_configure() { export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')" fi + if use lua; then + export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)" + fi + econf \ $(use_with java) \ $(use_with lua) \ |