Skip to content

Commit

Permalink
dev-libs/xapian-bindings: generalize to use tc-getPKG_CONFIG
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.20.1
  • Loading branch information
blueness committed Oct 13, 2015
1 parent 68f4962 commit 8f0da18
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions dev-libs/xapian-bindings/xapian-bindings-1.2.21.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PHP_EXT_OPTIONAL_USE="php"

#mono violates sandbox, we disable it until we figure this out
#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
inherit java-pkg-opt-2 php-ext-source-r2 python-r1
inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs

DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/"
Expand All @@ -36,6 +36,7 @@ COMMONDEPEND="=dev-libs/xapian-${PV}*
tcl? ( >=dev-lang/tcl-8.1:0= )"
# mono? ( >=dev-lang/mono-1.0.8 )
DEPEND="${COMMONDEPEND}
virtual/pkgconfig
java? ( >=virtual/jdk-1.3 )"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.3 )"
Expand Down Expand Up @@ -75,7 +76,7 @@ src_configure() {
fi

if use lua; then
export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
fi

econf \
Expand Down
5 changes: 3 additions & 2 deletions dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PHP_EXT_NAME="xapian"
PHP_EXT_INI="yes"
PHP_EXT_OPTIONAL_USE="php"

inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2
inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs

DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/"
Expand All @@ -36,6 +36,7 @@ COMMONDEPEND="=dev-libs/xapian-${PV}*
ruby? ( dev-lang/ruby:= )
tcl? ( >=dev-lang/tcl-8.1:0= )"
DEPEND="${COMMONDEPEND}
virtual/pkgconfig
java? ( >=virtual/jdk-1.3 )"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.3 )"
Expand Down Expand Up @@ -71,7 +72,7 @@ src_configure() {
fi

if use lua; then
export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
fi

econf \
Expand Down

0 comments on commit 8f0da18

Please sign in to comment.