From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1E8381382C5 for ; Sat, 20 Jun 2020 16:34:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FFDBE093A; Sat, 20 Jun 2020 16:34:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15B1DE0932 for ; Sat, 20 Jun 2020 16:34:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B69E34F3CC for ; Sat, 20 Jun 2020 16:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 054DB2C4 for ; Sat, 20 Jun 2020 16:34:11 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1592670776.f4d14fc278395d85b549bb9fdbc3eceba7da2940.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-10.0.1.9999.ebuild sys-libs/libcxx/libcxx-10.0.1_rc1.ebuild sys-libs/libcxx/libcxx-11.0.0.9999.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f4d14fc278395d85b549bb9fdbc3eceba7da2940 X-VCS-Branch: master Date: Sat, 20 Jun 2020 16:34:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b7ea4bd-4166-42da-a760-f643dde2a902 X-Archives-Hash: fc54698927db5043ea166b30adfa1dbb commit: f4d14fc278395d85b549bb9fdbc3eceba7da2940 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 16:25:20 2020 +0000 Commit: Michał Górny gentoo 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 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 }