Gentoo Archives: gentoo-commits

From: "Hanno Böck" <hanno@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rebar/, dev-util/rebar/files/
Date: Mon, 01 Jun 2020 17:36:51
Message-Id: 1591033000.a4e88d92f1ccfed61a5277ec9b60aebdaf49e185.hanno@gentoo
1 commit: a4e88d92f1ccfed61a5277ec9b60aebdaf49e185
2 Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 1 17:35:12 2020 +0000
4 Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 17:36:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e88d92
7
8 dev-util/rebar: Fix compatibility with erlang 23.
9
10 Closes: https://bugs.gentoo.org/724648
11 Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
12 Package-Manager: Portage-2.3.100, Repoman-2.3.22
13
14 dev-util/rebar/files/rebar-erlang23.diff | 12 ++++++++++++
15 dev-util/rebar/rebar-2.6.4-r1.ebuild | 30 ++++++++++++++++++++++++++++++
16 2 files changed, 42 insertions(+)
17
18 diff --git a/dev-util/rebar/files/rebar-erlang23.diff b/dev-util/rebar/files/rebar-erlang23.diff
19 new file mode 100644
20 index 00000000000..da4835a8b28
21 --- /dev/null
22 +++ b/dev-util/rebar/files/rebar-erlang23.diff
23 @@ -0,0 +1,12 @@
24 +diff -Naurp a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
25 +--- a/src/rebar_port_compiler.erl 2016-08-31 16:47:31.000000000 +0200
26 ++++ b/src/rebar_port_compiler.erl 2020-05-23 13:03:22.464682124 +0200
27 +@@ -673,7 +673,7 @@ default_env() ->
28 + "\" "
29 + ])},
30 + {"ERL_EI_LIBDIR", lists:concat(["\"", erl_interface_dir(lib), "\""])},
31 +- {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lerl_interface -lei"},
32 ++ {"ERL_LDFLAGS" , " -L$ERL_EI_LIBDIR -lei"},
33 + {"ERLANG_ARCH" , rebar_utils:wordsize()},
34 + {"ERLANG_TARGET", rebar_utils:get_arch()},
35 +
36
37 diff --git a/dev-util/rebar/rebar-2.6.4-r1.ebuild b/dev-util/rebar/rebar-2.6.4-r1.ebuild
38 new file mode 100644
39 index 00000000000..ea5c7125e53
40 --- /dev/null
41 +++ b/dev-util/rebar/rebar-2.6.4-r1.ebuild
42 @@ -0,0 +1,30 @@
43 +# Copyright 1999-2020 Gentoo Authors
44 +# Distributed under the terms of the GNU General Public License v2
45 +
46 +EAPI=7
47 +
48 +inherit bash-completion-r1
49 +
50 +DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
51 +HOMEPAGE="https://github.com/rebar/rebar"
52 +SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
53 +
54 +LICENSE="Apache-2.0"
55 +SLOT="0"
56 +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
57 +IUSE=""
58 +
59 +RDEPEND="dev-lang/erlang:="
60 +DEPEND="${RDEPEND}"
61 +
62 +PATCHES=( "${FILESDIR}/rebar-erlang23.diff" )
63 +
64 +src_test() {
65 + emake xref
66 +}
67 +
68 +src_install() {
69 + dobin rebar
70 + dodoc rebar.config.sample THANKS
71 + dobashcomp priv/shell-completion/bash/${PN}
72 +}