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 DE73F138334 for ; Mon, 23 Dec 2019 23:11:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1338E0AFE; Mon, 23 Dec 2019 23:11:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 94066E0AF8 for ; Mon, 23 Dec 2019 23:11:19 +0000 (UTC) Received: from tuxbrain.localnet (62-46-127-101.adsl.highway.telekom.at [62.46.127.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: asturm) by smtp.gentoo.org (Postfix) with ESMTPSA id 70FC934DB06 for ; Mon, 23 Dec 2019 23:11:18 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 2/2] cmake-multilib.eclass: Add CMAKE_ECLASS switch Date: Tue, 24 Dec 2019 00:11:10 +0100 Message-ID: <5176096.ZASKD2KPVS@tuxbrain> In-Reply-To: <1777207.7Z3S40VBb9@tuxbrain> References: <1777207.7Z3S40VBb9@tuxbrain> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Archives-Salt: 64b45f4a-f01d-4651-b811-169066b014bf X-Archives-Hash: 318c823a723d8e55955e0739a8a7ee15 For transition from cmake-utils.eclass to cmake.eclass. --- eclass/cmake-multilib.eclass | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 9d617900b73..2693d9c72e2 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cmake-multilib.eclass @@ -19,6 +19,12 @@ # in multilib-minimal, yet they ought to call appropriate cmake-utils # phase rather than 'default'. +# @ECLASS-VARIABLE: CMAKE_ECLASS +# @DESCRIPTION: +# Default is "cmake-utils" for compatibility. Specify "cmake" for ebuilds +# that ported from cmake-utils.eclass to cmake.eclass already. +: ${CMAKE_ECLASS:=cmake-utils} + case ${EAPI:-0} in [67]) ;; *) die "EAPI=${EAPI} is not supported" ;; @@ -28,7 +34,15 @@ if [[ ${CMAKE_IN_SOURCE_BUILD} ]]; then die "${ECLASS}: multilib support requires out-of-source builds." fi -inherit cmake-utils multilib-minimal +case ${CMAKE_ECLASS} in + cmake-utils|cmake) ;; + *) + eerror "Unknown value for \${CMAKE_ECLASS}" + die "Value ${CMAKE_ECLASS} is not supported" + ;; +esac + +inherit ${CMAKE_ECLASS} multilib-minimal EXPORT_FUNCTIONS src_configure src_compile src_test src_install @@ -39,7 +53,7 @@ cmake-multilib_src_configure() { } multilib_src_configure() { - cmake-utils_src_configure "${_cmake_args[@]}" + ${CMAKE_ECLASS}_src_configure "${_cmake_args[@]}" } cmake-multilib_src_compile() { @@ -49,7 +63,7 @@ cmake-multilib_src_compile() { } multilib_src_compile() { - cmake-utils_src_compile "${_cmake_args[@]}" + ${CMAKE_ECLASS}_src_compile "${_cmake_args[@]}" } cmake-multilib_src_test() { @@ -59,7 +73,7 @@ cmake-multilib_src_test() { } multilib_src_test() { - cmake-utils_src_test "${_cmake_args[@]}" + ${CMAKE_ECLASS}_src_test "${_cmake_args[@]}" } cmake-multilib_src_install() { @@ -69,5 +83,5 @@ cmake-multilib_src_install() { } multilib_src_install() { - cmake-utils_src_install "${_cmake_args[@]}" + ${CMAKE_ECLASS}_src_install "${_cmake_args[@]}" } ---