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-util/lldb/
Date: Sun, 29 Nov 2020 08:59:37
Message-Id: 1606640334.02f2de40dd71c4991832d06e64b9ea358c14e7f5.mgorny@gentoo
1 commit: 02f2de40dd71c4991832d06e64b9ea358c14e7f5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:55:13 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:58:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f2de40
7
8 dev-util/lldb: Delay llvm.org_set_globals after vars
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-util/lldb/lldb-11.0.0.9999.ebuild | 10 ++++++----
13 dev-util/lldb/lldb-12.0.0.9999.ebuild | 10 ++++++----
14 2 files changed, 12 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
17 index f16add65dbf..e3f6cc1ae82 100644
18 --- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
19 +++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
20 @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
21
22 DESCRIPTION="The LLVM debugger"
23 HOMEPAGE="https://llvm.org/"
24 -LLVM_COMPONENTS=( lldb )
25 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
26 -llvm.org_set_globals
27
28 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
29 SLOT="0"
30 @@ -40,9 +37,14 @@ BDEPEND="
31 $(python_gen_cond_dep "
32 ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
33 ")
34 - sys-devel/lld )
35 + sys-devel/lld
36 + )
37 ${PYTHON_DEPS}"
38
39 +LLVM_COMPONENTS=( lldb )
40 +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
41 +llvm.org_set_globals
42 +
43 pkg_setup() {
44 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
45 python-single-r1_pkg_setup
46
47 diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
48 index 9e83aa0a249..bcf3d783cb7 100644
49 --- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
50 +++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
51 @@ -8,9 +8,6 @@ inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
52
53 DESCRIPTION="The LLVM debugger"
54 HOMEPAGE="https://llvm.org/"
55 -LLVM_COMPONENTS=( lldb )
56 -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
57 -llvm.org_set_globals
58
59 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
60 SLOT="0"
61 @@ -40,9 +37,14 @@ BDEPEND="
62 $(python_gen_cond_dep "
63 ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
64 ")
65 - sys-devel/lld )
66 + sys-devel/lld
67 + )
68 ${PYTHON_DEPS}"
69
70 +LLVM_COMPONENTS=( lldb )
71 +LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
72 +llvm.org_set_globals
73 +
74 pkg_setup() {
75 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
76 python-single-r1_pkg_setup