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-libs/libcxx/
Date: Sun, 29 Nov 2020 08:59:38
Message-Id: 1606640338.eb44131c604f2cf17d28cd9999e2641c58708656.mgorny@gentoo
1 commit: eb44131c604f2cf17d28cd9999e2641c58708656
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 08:56:59 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 08:58:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb44131c
7
8 sys-libs/libcxx: Delay llvm.org_set_globals after vars
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/libcxx-11.0.0.9999.ebuild | 5 +++--
13 sys-libs/libcxx/libcxx-12.0.0.9999.ebuild | 5 +++--
14 2 files changed, 6 insertions(+), 4 deletions(-)
15
16 diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
17 index 8257e75c34d..dd1a1a1f3a2 100644
18 --- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
19 +++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
20 @@ -9,8 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
21
22 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
23 HOMEPAGE="https://libcxx.llvm.org/"
24 -LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
25 -llvm.org_set_globals
26
27 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
28 SLOT="0"
29 @@ -36,6 +34,9 @@ BDEPEND="
30
31 DOCS=( CREDITS.TXT )
32
33 +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
34 +llvm.org_set_globals
35 +
36 python_check_deps() {
37 has_version "dev-python/lit[${PYTHON_USEDEP}]"
38 }
39
40 diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
41 index 8257e75c34d..dd1a1a1f3a2 100644
42 --- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
43 +++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
44 @@ -9,8 +9,6 @@ inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
45
46 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
47 HOMEPAGE="https://libcxx.llvm.org/"
48 -LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
49 -llvm.org_set_globals
50
51 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
52 SLOT="0"
53 @@ -36,6 +34,9 @@ BDEPEND="
54
55 DOCS=( CREDITS.TXT )
56
57 +LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake/modules,utils/llvm-lit} )
58 +llvm.org_set_globals
59 +
60 python_check_deps() {
61 has_version "dev-python/lit[${PYTHON_USEDEP}]"
62 }