commit:     cce0a3aae046274707024d007aaa5180f45c90c6
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 09:57:48 2016 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 13:12:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce0a3aa

net-im/ejabberd: Use internal eldap module instead of system one

First lookup ejabberd directory for modules.

Gentoo-Bug: 591862

Package-Manager: portage-2.3.0

 net-im/ejabberd/ejabberd-16.04-r1.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild 
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 104edf0..33a6258 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -187,6 +187,14 @@ src_prepare() {
        skip_docs
        adjust_config
        customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+       # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+       # rather than its parent which is default. That way ejabberd directory
+       # takes precedence is module lookup.
+       local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+       sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+               -i "${S}/ejabberdctl.template" \
+               || die 'failed to set ERL_LIBS in ejabberdctl.template'
 }
 
 src_configure() {

Reply via email to