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: sys-devel/lld/
Date: Sun, 29 Nov 2020 08:59:37
Message-Id: 1606639929.e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d.mgorny@gentoo
1 commit: e2ef809fb26fc3ba1b40677f0a0ff59fc8157c7d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:52:09 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:52:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ef809f
7
8 sys-devel/lld: Delay llvm.org_set_globals after vars
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/lld/lld-11.0.0.9999.ebuild | 10 ++++++----
13 sys-devel/lld/lld-12.0.0.9999.ebuild | 10 ++++++----
14 2 files changed, 12 insertions(+), 8 deletions(-)
15
16 diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
17 index 05be08d3d09..4b86a2bdffe 100644
18 --- a/sys-devel/lld/lld-11.0.0.9999.ebuild
19 +++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
20 @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
21
22 DESCRIPTION="The LLVM linker (link editor)"
23 HOMEPAGE="https://llvm.org/"
24 -LLVM_COMPONENTS=( lld )
25 -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
26 -llvm.org_set_globals
27
28 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
29 SLOT="0"
30 @@ -20,11 +17,16 @@ RESTRICT="!test? ( test )"
31
32 RDEPEND="~sys-devel/llvm-${PV}"
33 DEPEND="${RDEPEND}"
34 -BDEPEND="test? (
35 +BDEPEND="
36 + test? (
37 >=dev-util/cmake-3.16
38 $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
39 )"
40
41 +LLVM_COMPONENTS=( lld )
42 +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
43 +llvm.org_set_globals
44 +
45 python_check_deps() {
46 has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
47 }
48
49 diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild
50 index 61159e289d5..3cf868e55cb 100644
51 --- a/sys-devel/lld/lld-12.0.0.9999.ebuild
52 +++ b/sys-devel/lld/lld-12.0.0.9999.ebuild
53 @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-any-r1
54
55 DESCRIPTION="The LLVM linker (link editor)"
56 HOMEPAGE="https://llvm.org/"
57 -LLVM_COMPONENTS=( lld libunwind/include/mach-o )
58 -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
59 -llvm.org_set_globals
60
61 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
62 SLOT="0"
63 @@ -20,11 +17,16 @@ RESTRICT="!test? ( test )"
64
65 RDEPEND="~sys-devel/llvm-${PV}"
66 DEPEND="${RDEPEND}"
67 -BDEPEND="test? (
68 +BDEPEND="
69 + test? (
70 >=dev-util/cmake-3.16
71 $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
72 )"
73
74 +LLVM_COMPONENTS=( lld libunwind/include/mach-o )
75 +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
76 +llvm.org_set_globals
77 +
78 python_check_deps() {
79 has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
80 }