Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/llvm-ocaml/
Date: Sun, 29 Nov 2020 08:59:36
Message-Id: 1606639876.11d6eee3d03799574183ac586602af89e8d06d61.mgorny@gentoo
1 commit: 11d6eee3d03799574183ac586602af89e8d06d61
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:51:16 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:51:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11d6eee3
7
8 dev-ml/llvm-ocaml: Delay llvm.org_set_globals after vars
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild | 5 +++--
13 dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild | 5 +++--
14 2 files changed, 6 insertions(+), 4 deletions(-)
15
16 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
17 index a39cfca35bc..f63a8b33834 100644
18 --- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
19 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
20 @@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
21
22 DESCRIPTION="OCaml bindings for LLVM"
23 HOMEPAGE="https://llvm.org/"
24 -LLVM_COMPONENTS=( llvm )
25 -llvm.org_set_globals
26
27 # Keep in sync with sys-devel/llvm
28 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
29 @@ -39,6 +37,9 @@ BDEPEND="
30 test? ( dev-ml/ounit )
31 ${PYTHON_DEPS}"
32
33 +LLVM_COMPONENTS=( llvm )
34 +llvm.org_set_globals
35 +
36 pkg_setup() {
37 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
38 python-any-r1_pkg_setup
39
40 diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
41 index 3ded7e4e44f..1d3cf3b002d 100644
42 --- a/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
43 +++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0.9999.ebuild
44 @@ -8,8 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
45
46 DESCRIPTION="OCaml bindings for LLVM"
47 HOMEPAGE="https://llvm.org/"
48 -LLVM_COMPONENTS=( llvm )
49 -llvm.org_set_globals
50
51 # Keep in sync with sys-devel/llvm
52 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
53 @@ -39,6 +37,9 @@ BDEPEND="
54 test? ( dev-ml/ounit )
55 ${PYTHON_DEPS}"
56
57 +LLVM_COMPONENTS=( llvm )
58 +llvm.org_set_globals
59 +
60 pkg_setup() {
61 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
62 python-any-r1_pkg_setup