[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/

[Michał Górny]

commit:     f4d14fc278395d85b549bb9fdbc3eceba7da2940
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 16:25:20 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 16:32:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d14fc2

sys-libs/libcxx: Port to cmake.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxx/libcxx-10.0.1.9999.ebuild | 9 +++++----
 sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild  | 9 +++++----
 sys-libs/libcxx/libcxx-11.0.0.9999.ebuild | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild 
b/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
index 8e1fa4f0419..a45a04b2ccc 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-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
@@ -60,7 +61,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 test_compiler() {
@@ -140,12 +141,12 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-libcxx
+       cmake_build check-libcxx
 }
 
 # Usage: deps
@@ -191,7 +192,7 @@ gen_shared_ldscript() {
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        gen_shared_ldscript
        use static-libs && gen_static_ldscript
 }

diff --git a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild 
b/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
index 8e1fa4f0419..a45a04b2ccc 100644
--- a/sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-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
@@ -60,7 +61,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 test_compiler() {
@@ -140,12 +141,12 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-libcxx
+       cmake_build check-libcxx
 }
 
 # Usage: deps
@@ -191,7 +192,7 @@ gen_shared_ldscript() {
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        gen_shared_ldscript
        use static-libs && gen_static_ldscript
 }

diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild 
b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index a06bb57dd7b..9dd5e854c92 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-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
@@ -61,7 +62,7 @@ src_prepare() {
        # cmake eclasses suck by forcing ${S} here
        CMAKE_USE_DIR=${S} \
        S=${WORKDIR} \
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 test_compiler() {
@@ -141,12 +142,12 @@ multilib_src_configure() {
                        
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
                )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_test() {
        local -x LIT_PRESERVES_TMP=1
-       cmake-utils_src_make check-cxx
+       cmake_build check-cxx
 }
 
 # Usage: deps
@@ -192,7 +193,7 @@ gen_shared_ldscript() {
 }
 
 multilib_src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        gen_shared_ldscript
        use static-libs && gen_static_ldscript
 }