Gentoo Archives: gentoo-commits

From: "Amadeusz Piotr Żołnowski" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
Date: Sat, 27 Aug 2016 13:28:05
Message-Id: 1472303570.cce0a3aae046274707024d007aaa5180f45c90c6.aidecoe@gentoo
1 commit: cce0a3aae046274707024d007aaa5180f45c90c6
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 27 09:57:48 2016 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 27 13:12:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce0a3aa
7
8 net-im/ejabberd: Use internal eldap module instead of system one
9
10 First lookup ejabberd directory for modules.
11
12 Gentoo-Bug: 591862
13
14 Package-Manager: portage-2.3.0
15
16 net-im/ejabberd/ejabberd-16.04-r1.ebuild | 8 ++++++++
17 1 file changed, 8 insertions(+)
18
19 diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
20 index 104edf0..33a6258 100644
21 --- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
22 +++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
23 @@ -187,6 +187,14 @@ src_prepare() {
24 skip_docs
25 adjust_config
26 customize_epam_wrapper "${FILESDIR}/epam-wrapper"
27 +
28 + # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
29 + # rather than its parent which is default. That way ejabberd directory
30 + # takes precedence is module lookup.
31 + local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
32 + sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
33 + -i "${S}/ejabberdctl.template" \
34 + || die 'failed to set ERL_LIBS in ejabberdctl.template'
35 }
36
37 src_configure() {