1 |
commit: 462a7e914eaf7d039b91b8e9fb55396fcdc68cea |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 1 18:02:58 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 3 11:46:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462a7e91 |
7 |
|
8 |
sys-libs/libcxx: Port to llvm.org eclass |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-libs/libcxx/libcxx-10.0.0.9999.ebuild | 12 +++--------- |
13 |
sys-libs/libcxx/libcxx-9.0.0.ebuild | 7 +++---- |
14 |
sys-libs/libcxx/libcxx-9.0.1.9999.ebuild | 13 +++---------- |
15 |
3 files changed, 9 insertions(+), 23 deletions(-) |
16 |
|
17 |
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
18 |
index cf08961e9c8..f5f67053d77 100644 |
19 |
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
20 |
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild |
21 |
@@ -4,14 +4,13 @@ |
22 |
EAPI=7 |
23 |
|
24 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
25 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ |
26 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \ |
27 |
toolchain-funcs |
28 |
|
29 |
DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
30 |
HOMEPAGE="https://libcxx.llvm.org/" |
31 |
-SRC_URI="" |
32 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
33 |
-S=${WORKDIR}/${P}/libcxx |
34 |
+LLVM_COMPONENTS=( libcxx ) |
35 |
+llvm.org_set_globals |
36 |
|
37 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
38 |
SLOT="0" |
39 |
@@ -67,11 +66,6 @@ pkg_setup() { |
40 |
fi |
41 |
} |
42 |
|
43 |
-src_unpack() { |
44 |
- git-r3_fetch |
45 |
- git-r3_checkout '' '' '' libcxx |
46 |
-} |
47 |
- |
48 |
test_compiler() { |
49 |
$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
50 |
<<<'int main() { return 0; }' &>/dev/null |
51 |
|
52 |
diff --git a/sys-libs/libcxx/libcxx-9.0.0.ebuild b/sys-libs/libcxx/libcxx-9.0.0.ebuild |
53 |
index a4208b8cb49..76ae63ba35a 100644 |
54 |
--- a/sys-libs/libcxx/libcxx-9.0.0.ebuild |
55 |
+++ b/sys-libs/libcxx/libcxx-9.0.0.ebuild |
56 |
@@ -4,14 +4,13 @@ |
57 |
EAPI=7 |
58 |
|
59 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
60 |
-inherit cmake-multilib llvm multiprocessing python-any-r1 \ |
61 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \ |
62 |
toolchain-funcs |
63 |
|
64 |
-MY_P=${P}.src |
65 |
DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
66 |
HOMEPAGE="https://libcxx.llvm.org/" |
67 |
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz" |
68 |
-S=${WORKDIR}/${MY_P} |
69 |
+LLVM_COMPONENTS=( libcxx ) |
70 |
+llvm.org_set_globals |
71 |
|
72 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
73 |
SLOT="0" |
74 |
|
75 |
diff --git a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild |
76 |
index 4124a2fbf98..f5f67053d77 100644 |
77 |
--- a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild |
78 |
+++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild |
79 |
@@ -4,15 +4,13 @@ |
80 |
EAPI=7 |
81 |
|
82 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
83 |
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \ |
84 |
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \ |
85 |
toolchain-funcs |
86 |
|
87 |
DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
88 |
HOMEPAGE="https://libcxx.llvm.org/" |
89 |
-SRC_URI="" |
90 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
91 |
-EGIT_BRANCH="release/9.x" |
92 |
-S=${WORKDIR}/${P}/libcxx |
93 |
+LLVM_COMPONENTS=( libcxx ) |
94 |
+llvm.org_set_globals |
95 |
|
96 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
97 |
SLOT="0" |
98 |
@@ -68,11 +66,6 @@ pkg_setup() { |
99 |
fi |
100 |
} |
101 |
|
102 |
-src_unpack() { |
103 |
- git-r3_fetch |
104 |
- git-r3_checkout '' '' '' libcxx |
105 |
-} |
106 |
- |
107 |
test_compiler() { |
108 |
$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
109 |
<<<'int main() { return 0; }' &>/dev/null |