summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2017-05-28 14:29:55 +0100
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2017-05-28 14:29:55 +0100
commitf7e77ea56eaafd2422d50090000d52cae79ef264 (patch)
tree9770866bc95daf171f46c215de0448fb4522f999 /net-im/ejabberd
parentnet-im/ejabberd: Bump version (diff)
downloadgentoo-f7e77ea56eaafd2422d50090000d52cae79ef264.tar.gz
gentoo-f7e77ea56eaafd2422d50090000d52cae79ef264.tar.bz2
gentoo-f7e77ea56eaafd2422d50090000d52cae79ef264.zip
net-im/ejabberd: Bump version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-im/ejabberd')
-rw-r--r--net-im/ejabberd/ejabberd-17.04.ebuild3
-rw-r--r--net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch53
2 files changed, 55 insertions, 1 deletions
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild b/net-im/ejabberd/ejabberd-17.04.ebuild
index 75726aedb77..8b82f975af8 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -62,7 +62,8 @@ RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
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
new file mode 100644
index 00000000000..0a42f549b58
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
@@ -0,0 +1,53 @@
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 28 May 2017 14:22:08 +0100
+Subject: [PATCH] Don't configure or compile deps
+
+---
+ rebar.config.script | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..04f8b310 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
+ TestConfig]
+ end,
+
+-GenDepConfigureLine =
+-fun(DepPath, Flags) ->
+- ["sh -c 'if test ! -f ",DepPath,"config.status -o ",
+- "config.status -nt ",DepPath,"config.status; ",
+- "then (cd ", DepPath, " && ",
+- "CFLAGS=\"", CFlags,"\" ",
+- "CPPFLAGS=\"", CPPFlags, "\" "
+- "LDFLAGS=\"", LDFlags, "\"",
+- " ./configure ", string:join(Flags, " "),
+- "); fi'"]
+-end,
+-
+-GenDepsConfigure =
+-fun(Hooks) ->
+- lists:map(fun({Pkg, Flags}) ->
+- DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
+- {'compile',
+- lists:flatten(GenDepConfigureLine(DepPath, Flags))}
+- end, Hooks)
+-end,
+-
+ ProcessErlOpt = fun(Vals) ->
+ lists:map(
+ fun({i, Path}) ->
+@@ -315,8 +294,6 @@ Rules = [
+ AppendList([{coveralls, ".*", {git, "https://github.com/markusn/coveralls-erl.git", "master"}}]), []},
+ {[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
+ AppendList2(TravisPostHooks), [], false},
+- {[pre_hooks], [post_hook_configure], true,
+- AppendList2(GenDepsConfigure), [], []},
+ {[ct_extra_params], [eunit_compile_opts], true,
+ AppendStr2(CtParams), "", []},
+ {[erl_opts], true,
+--
+2.12.2
+