summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-06-20 18:25:20 +0200
committerMichał Górny <mgorny@gentoo.org>2020-06-20 18:32:56 +0200
commitf4d14fc278395d85b549bb9fdbc3eceba7da2940 (patch)
treeb4e1c6f4bbeabf863fe33485b2a59f39217150fb
parentsys-libs/libcxx: Apply patches in WORKDIR in 10.0.1+ (diff)
downloadgentoo-f4d14fc278395d85b549bb9fdbc3eceba7da2940.tar.gz
gentoo-f4d14fc278395d85b549bb9fdbc3eceba7da2940.tar.bz2
gentoo-f4d14fc278395d85b549bb9fdbc3eceba7da2940.zip
sys-libs/libcxx: Port to cmake.eclass
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--sys-libs/libcxx/libcxx-10.0.1.9999.ebuild9
-rw-r--r--sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild9
-rw-r--r--sys-libs/libcxx/libcxx-11.0.0.9999.ebuild9
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 8e1fa4f04199..a45a04b2ccc3 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 8e1fa4f04199..a45a04b2ccc3 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 a06bb57dd7bd..9dd5e854c928 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
}