Browse Source

[dev-libs/Ice] fix ruby, fix tests not finding libs

master
Robert Förster 7 years ago
parent
commit
04fde563ac
  1. 7
      dev-libs/Ice/Ice-3.6.1.ebuild

7
dev-libs/Ice/Ice-3.6.1.ebuild

@ -4,7 +4,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 python3_4 pypy )
PYTHON_COMPAT=( python{2_7,3_4} pypy )
MY_S="${WORKDIR}/ice-${PV}"
RUBY_OPTIONAL="yes"
@ -129,7 +129,6 @@ src_configure() {
-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
if use php ; then
sed -i \
-e "s|php-config|${EPREFIX}/usr/$(get_libdir)/php5.6/bin/php-config|" \
@ -144,7 +143,7 @@ src_configure() {
fi
if use ruby ; then
SITERUBY="$(ruby22 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitedir"]')"
MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
install_libdir=\"${ED}/${SITERUBY}\""
@ -271,6 +270,8 @@ run_tests() {
}
src_test() {
export LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
run_tests cpp || die "emake cpp test failed"
if use python ; then

Loading…
Cancel
Save