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: Fri, 01 Nov 2019 13:16:13
Message-Id: 1572614154.6af202dc37ef6ec98c3f93b59a2cbd80040931eb.mgorny@gentoo
1 commit: 6af202dc37ef6ec98c3f93b59a2cbd80040931eb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 1 08:34:52 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 1 13:15:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6af202dc
7
8 sys-libs/libcxx: Switch live to monorepo
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/libcxx-10.0.0.9999.ebuild | 9 +++++++--
13 sys-libs/libcxx/libcxx-9.0.1.9999.ebuild | 11 ++++++++---
14 2 files changed, 15 insertions(+), 5 deletions(-)
15
16 diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
17 index 83d8eeaa8c4..9c722cc3362 100644
18 --- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
19 +++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
20 @@ -16,8 +16,8 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
21 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
22 HOMEPAGE="https://libcxx.llvm.org/"
23 SRC_URI=""
24 -EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
25 - https://github.com/llvm-mirror/libcxx.git"
26 +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
27 +S=${WORKDIR}/${P}/libcxx
28
29 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
30 SLOT="0"
31 @@ -73,6 +73,11 @@ pkg_setup() {
32 fi
33 }
34
35 +src_unpack() {
36 + git-r3_fetch
37 + git-r3_checkout '' '' '' libcxx
38 +}
39 +
40 test_compiler() {
41 $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
42 <<<'int main() { return 0; }' &>/dev/null
43
44 diff --git a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
45 index 5a84e2f5f99..f70527cd308 100644
46 --- a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
47 +++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
48 @@ -16,9 +16,9 @@ inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
49 DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
50 HOMEPAGE="https://libcxx.llvm.org/"
51 SRC_URI=""
52 -EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
53 - https://github.com/llvm-mirror/libcxx.git"
54 -EGIT_BRANCH="release_90"
55 +EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
56 +EGIT_BRANCH="release/9.x"
57 +S=${WORKDIR}/${P}/libcxx
58
59 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
60 SLOT="0"
61 @@ -74,6 +74,11 @@ pkg_setup() {
62 fi
63 }
64
65 +src_unpack() {
66 + git-r3_fetch
67 + git-r3_checkout '' '' '' libcxx
68 +}
69 +
70 test_compiler() {
71 $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
72 <<<'int main() { return 0; }' &>/dev/null