commit: c13bd50c9fac3e02223ec84dda26819755025b3b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 16:21:44 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 16:32:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13bd50c
sys-libs/libcxxabi: Port to cmake.eclass
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild | 11 ++++++-----
sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild | 11 ++++++-----
sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 11 ++++++-----
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
index 9a025806195..a5bff7e08d9 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
PYTHON_COMPAT=( python3_{6,7} )
inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
toolchain-funcs
@@ -48,7 +49,7 @@ src_prepare() {
# cmake eclasses suck by forcing ${S} here
CMAKE_USE_DIR=${S} \
S=${WORKDIR} \
- cmake-utils_src_prepare
+ cmake_src_prepare
}
multilib_src_configure() {
@@ -87,7 +88,7 @@ multilib_src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
build_libcxx() {
@@ -107,8 +108,8 @@ build_libcxx() {
-DLIBCXX_INCLUDE_TESTS=OFF
)
- cmake-utils_src_configure
- cmake-utils_src_compile
+ cmake_src_configure
+ cmake_src_compile
}
multilib_src_test() {
@@ -117,7 +118,7 @@ multilib_src_test() {
mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" ||
die
local -x LIT_PRESERVES_TMP=1
- cmake-utils_src_make check-libcxxabi
+ cmake_build check-libcxxabi
}
multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
index 9a025806195..a5bff7e08d9 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
PYTHON_COMPAT=( python3_{6,7} )
inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
toolchain-funcs
@@ -48,7 +49,7 @@ src_prepare() {
# cmake eclasses suck by forcing ${S} here
CMAKE_USE_DIR=${S} \
S=${WORKDIR} \
- cmake-utils_src_prepare
+ cmake_src_prepare
}
multilib_src_configure() {
@@ -87,7 +88,7 @@ multilib_src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
build_libcxx() {
@@ -107,8 +108,8 @@ build_libcxx() {
-DLIBCXX_INCLUDE_TESTS=OFF
)
- cmake-utils_src_configure
- cmake-utils_src_compile
+ cmake_src_configure
+ cmake_src_compile
}
multilib_src_test() {
@@ -117,7 +118,7 @@ multilib_src_test() {
mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" ||
die
local -x LIT_PRESERVES_TMP=1
- cmake-utils_src_make check-libcxxabi
+ cmake_build check-libcxxabi
}
multilib_src_install_all() {
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index 5fb1704b2c1..15a5db04309 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
toolchain-funcs
@@ -48,7 +49,7 @@ src_prepare() {
# cmake eclasses suck by forcing ${S} here
CMAKE_USE_DIR=${S} \
S=${WORKDIR} \
- cmake-utils_src_prepare
+ cmake_src_prepare
}
multilib_src_configure() {
@@ -87,7 +88,7 @@ multilib_src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
build_libcxx() {
@@ -107,8 +108,8 @@ build_libcxx() {
-DLIBCXX_INCLUDE_TESTS=OFF
)
- cmake-utils_src_configure
- cmake-utils_src_compile
+ cmake_src_configure
+ cmake_src_compile
}
multilib_src_test() {
@@ -117,7 +118,7 @@ multilib_src_test() {
mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" ||
die
local -x LIT_PRESERVES_TMP=1
- cmake-utils_src_make check-cxxabi
+ cmake_build check-cxxabi
}
multilib_src_install_all() {
