commit: 462a7e914eaf7d039b91b8e9fb55396fcdc68cea
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 18:02:58 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 11:46:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462a7e91
sys-libs/libcxx: Port to llvm.org eclass
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-libs/libcxx/libcxx-10.0.0.9999.ebuild | 12 +++---------
sys-libs/libcxx/libcxx-9.0.0.ebuild | 7 +++----
sys-libs/libcxx/libcxx-9.0.1.9999.ebuild | 13 +++----------
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
index cf08961e9c8..f5f67053d77 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
@@ -4,14 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
toolchain-funcs
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
-S=${WORKDIR}/${P}/libcxx
+LLVM_COMPONENTS=( libcxx )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
@@ -67,11 +66,6 @@ pkg_setup() {
fi
}
-src_unpack() {
- git-r3_fetch
- git-r3_checkout '' '' '' libcxx
-}
-
test_compiler() {
$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
<<<'int main() { return 0; }' &>/dev/null
diff --git a/sys-libs/libcxx/libcxx-9.0.0.ebuild
b/sys-libs/libcxx/libcxx-9.0.0.ebuild
index a4208b8cb49..76ae63ba35a 100644
--- a/sys-libs/libcxx/libcxx-9.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.0.ebuild
@@ -4,14 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-multilib llvm multiprocessing python-any-r1 \
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
toolchain-funcs
-MY_P=${P}.src
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
+LLVM_COMPONENTS=( libcxx )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
diff --git a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
index 4124a2fbf98..f5f67053d77 100644
--- a/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.9999.ebuild
@@ -4,15 +4,13 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1 \
+inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
toolchain-funcs
DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
HOMEPAGE="https://libcxx.llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
-EGIT_BRANCH="release/9.x"
-S=${WORKDIR}/${P}/libcxx
+LLVM_COMPONENTS=( libcxx )
+llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
@@ -68,11 +66,6 @@ pkg_setup() {
fi
}
-src_unpack() {
- git-r3_fetch
- git-r3_checkout '' '' '' libcxx
-}
-
test_compiler() {
$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
<<<'int main() { return 0; }' &>/dev/null