| 1 |
commit: f7e77ea56eaafd2422d50090000d52cae79ef264 |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 28 13:29:55 2017 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 28 13:29:55 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e77ea5 |
| 7 |
|
| 8 |
net-im/ejabberd: Bump version |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
net-im/ejabberd/ejabberd-17.04.ebuild | 3 +- |
| 13 |
...7.04-0001-Don-t-configure-or-compile-deps.patch | 53 ++++++++++++++++++++++ |
| 14 |
2 files changed, 55 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04.ebuild |
| 17 |
index 75726aedb77..8b82f975af8 100644 |
| 18 |
--- a/net-im/ejabberd/ejabberd-17.04.ebuild |
| 19 |
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild |
| 20 |
@@ -62,7 +62,8 @@ RDEPEND="${CDEPEND} |
| 21 |
captcha? ( media-gfx/imagemagick[truetype,png] )" |
| 22 |
|
| 23 |
DOCS=( README ) |
| 24 |
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" ) |
| 25 |
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" |
| 26 |
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" ) |
| 27 |
|
| 28 |
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
| 29 |
# Paths in net-im/jabber-base |
| 30 |
|
| 31 |
diff --git a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..0a42f549b58 |
| 34 |
--- /dev/null |
| 35 |
+++ b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch |
| 36 |
@@ -0,0 +1,53 @@ |
| 37 |
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
| 39 |
+Date: Sun, 28 May 2017 14:22:08 +0100 |
| 40 |
+Subject: [PATCH] Don't configure or compile deps |
| 41 |
+ |
| 42 |
+--- |
| 43 |
+ rebar.config.script | 23 ----------------------- |
| 44 |
+ 1 file changed, 23 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/rebar.config.script b/rebar.config.script |
| 47 |
+index 19142b9e..04f8b310 100644 |
| 48 |
+--- a/rebar.config.script |
| 49 |
++++ b/rebar.config.script |
| 50 |
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) -> |
| 51 |
+ TestConfig] |
| 52 |
+ end, |
| 53 |
+ |
| 54 |
+-GenDepConfigureLine = |
| 55 |
+-fun(DepPath, Flags) -> |
| 56 |
+- ["sh -c 'if test ! -f ",DepPath,"config.status -o ", |
| 57 |
+- "config.status -nt ",DepPath,"config.status; ", |
| 58 |
+- "then (cd ", DepPath, " && ", |
| 59 |
+- "CFLAGS=\"", CFlags,"\" ", |
| 60 |
+- "CPPFLAGS=\"", CPPFlags, "\" " |
| 61 |
+- "LDFLAGS=\"", LDFlags, "\"", |
| 62 |
+- " ./configure ", string:join(Flags, " "), |
| 63 |
+- "); fi'"] |
| 64 |
+-end, |
| 65 |
+- |
| 66 |
+-GenDepsConfigure = |
| 67 |
+-fun(Hooks) -> |
| 68 |
+- lists:map(fun({Pkg, Flags}) -> |
| 69 |
+- DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"), |
| 70 |
+- {'compile', |
| 71 |
+- lists:flatten(GenDepConfigureLine(DepPath, Flags))} |
| 72 |
+- end, Hooks) |
| 73 |
+-end, |
| 74 |
+- |
| 75 |
+ ProcessErlOpt = fun(Vals) -> |
| 76 |
+ lists:map( |
| 77 |
+ fun({i, Path}) -> |
| 78 |
+@@ -315,8 +294,6 @@ Rules = [ |
| 79 |
+ AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []}, |
| 80 |
+ {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true", |
| 81 |
+ AppendList2(TravisPostHooks), [], false}, |
| 82 |
+- {[pre_hooks], [post_hook_configure], true, |
| 83 |
+- AppendList2(GenDepsConfigure), [], []}, |
| 84 |
+ {[ct_extra_params], [eunit_compile_opts], true, |
| 85 |
+ AppendStr2(CtParams), "", []}, |
| 86 |
+ {[erl_opts], true, |
| 87 |
+-- |
| 88 |
+2.12.2 |
| 89 |
+ |
Archives