From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94BF1139695 for ; Sun, 28 May 2017 13:30:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D031E0C0D; Sun, 28 May 2017 13:30:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42C57E0C0D for ; Sun, 28 May 2017 13:30:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF1FF3413B7 for ; Sun, 28 May 2017 13:30:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F35847466 for ; Sun, 28 May 2017 13:30:09 +0000 (UTC) From: "Amadeusz Piotr Żołnowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amadeusz Piotr Żołnowski" Message-ID: <1495978195.f7e77ea56eaafd2422d50090000d52cae79ef264.aidecoe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/ejabberd/ejabberd-17.04.ebuild net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch X-VCS-Directories: net-im/ejabberd/files/ net-im/ejabberd/ X-VCS-Committer: aidecoe X-VCS-Committer-Name: Amadeusz Piotr Żołnowski X-VCS-Revision: f7e77ea56eaafd2422d50090000d52cae79ef264 X-VCS-Branch: master Date: Sun, 28 May 2017 13:30:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: edc3fa0d-2962-4cd4-a14c-51380366e5bd X-Archives-Hash: d205805c05188200e787a4885de8d03a commit: f7e77ea56eaafd2422d50090000d52cae79ef264 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Sun May 28 13:29:55 2017 +0000 Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Sun May 28 13:29:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e77ea5 net-im/ejabberd: Bump version Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-im/ejabberd/ejabberd-17.04.ebuild | 3 +- ...7.04-0001-Don-t-configure-or-compile-deps.patch | 53 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) 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?= +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 +