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 E5C261382C5 for ; Sun, 7 Mar 2021 15:19:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14265E0848; Sun, 7 Mar 2021 15:19:34 +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 CCBF2E081E for ; Sun, 7 Mar 2021 15:19:33 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] cmake-multilib.eclass: Drop EAPI-6 support and prepare to drop cmake-utils w/ future EAPI Date: Sun, 07 Mar 2021 16:19:15 +0100 Message-ID: <4428319.vXUDI8C0e8@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-Type: multipart/signed; boundary="nextPart2009678.9o76ZdvQCi"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: 139ae28d-5680-4313-9b30-9ae8fbc019cc X-Archives-Hash: 017efa5b7864558cba939e8d2454af97 --nextPart2009678.9o76ZdvQCi Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: cmake-multilib.eclass: Drop EAPI-6 support and prepare to drop cmake-utils w/ future EAPI Date: Sun, 07 Mar 2021 16:19:15 +0100 Message-ID: <4428319.vXUDI8C0e8@tuxbrain> diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass =2D-- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -1,4 +1,4 @@ =2D# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 =20 # @ECLASS: cmake-multilib.eclass @@ -6,27 +6,41 @@ # gx86-multilib team # @AUTHOR: # Author: Micha=C5=82 G=C3=B3rny =2D# @SUPPORTED_EAPIS: 6 7 =2D# @BLURB: cmake-utils wrapper for multilib builds +# @SUPPORTED_EAPIS: 7 +# @BLURB: cmake wrapper for multilib builds # @DESCRIPTION: =2D# The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5) +# The cmake-multilib.eclass provides a glue between cmake.eclass(5) # and multilib-minimal.eclass(5), aiming to provide a convenient way # to build packages using cmake for multiple ABIs. # # Inheriting this eclass sets IUSE and exports default multilib_src_*() =2D# sub-phases that call cmake-utils phase functions for each ABI enabled. +# sub-phases that call cmake phase functions for each ABI enabled. # The multilib_src_*() functions can be defined in ebuild just like =2D# in multilib-minimal, yet they ought to call appropriate cmake-utils +# in multilib-minimal, yet they ought to call appropriate cmake # phase rather than 'default'. =20 # @ECLASS-VARIABLE: CMAKE_ECLASS # @DESCRIPTION: =2D# Default is "cmake-utils" for compatibility. Specify "cmake" for ebuilds =2D# that ported from cmake-utils.eclass to cmake.eclass already. +# Default is "cmake-utils" for compatibility in EAPI-7. Specify "cmake" for +# ebuilds that ported to cmake.eclass already. Future EAPI is "cmake" only. : ${CMAKE_ECLASS:=3Dcmake-utils} =20 +# @ECLASS-VARIABLE: _CMAKE_ECLASS_IMPL +# @INTERNAL +# @DESCRIPTION: +# Default is "cmake" for future EAPI. Cleanup once EAPI-7 support is gone. +_CMAKE_ECLASS_IMPL=3Dcmake + case ${EAPI:-0} in =2D [67]) ;; + 7) case ${CMAKE_ECLASS} in + cmake-utils|cmake) ;; + *) + eerror "Unknown value for \$ {CMAKE_ECLASS}" + die "Value ${CMAKE_ECLASS} is not=20 supported" + ;; + esac + _CMAKE_ECLASS_IMPL=3D${CMAKE_ECLASS} + ;; *) die "EAPI=3D${EAPI} is not supported" ;; esac =20 @@ -34,15 +48,7 @@ if [[ ${CMAKE_IN_SOURCE_BUILD} ]]; then die "${ECLASS}: multilib support requires out-of-source builds." fi =20 =2Dcase ${CMAKE_ECLASS} in =2D cmake-utils|cmake) ;; =2D *) =2D eerror "Unknown value for \${CMAKE_ECLASS}" =2D die "Value ${CMAKE_ECLASS} is not supported" =2D ;; =2Desac =2D =2Dinherit ${CMAKE_ECLASS} multilib-minimal +inherit ${_CMAKE_ECLASS_IMPL} multilib-minimal =20 EXPORT_FUNCTIONS src_configure src_compile src_test src_install =20 @@ -53,7 +59,7 @@ cmake-multilib_src_configure() { } =20 multilib_src_configure() { =2D ${CMAKE_ECLASS}_src_configure "${_cmake_args[@]}" + ${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}" } =20 cmake-multilib_src_compile() { @@ -63,7 +69,7 @@ cmake-multilib_src_compile() { } =20 multilib_src_compile() { =2D ${CMAKE_ECLASS}_src_compile "${_cmake_args[@]}" + ${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}" } =20 cmake-multilib_src_test() { @@ -73,7 +79,7 @@ cmake-multilib_src_test() { } =20 multilib_src_test() { =2D ${CMAKE_ECLASS}_src_test "${_cmake_args[@]}" + ${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}" } =20 cmake-multilib_src_install() { @@ -83,5 +89,5 @@ cmake-multilib_src_install() { } =20 multilib_src_install() { =2D ${CMAKE_ECLASS}_src_install "${_cmake_args[@]}" + ${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}" } --nextPart2009678.9o76ZdvQCi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEE/x0UfMgLbk/MiQ+AUIqgAODug+AFAmBE7vNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEZG MUQxNDdDQzgwQjZFNEZDQzg5MEY4MDUwOEFBMDAwRTBFRTgzRTAACgkQUIqgAODu g+BCmAf7BTgJkxpsLIBlr2taJrDSqLjPZNwyMs2klrKyO+w7hLm5gGKSNBACNGnV klxjJSUaNxLVdDCp+TvSOHGMeE9VP9pzJWRvbet3cYV2VSkXzERw1i0B3+DX3A0+ /m9LH3G0lhXDFJAwY5UPDtzfjxpX+tBMsRPJUriVneObxaiXKaKX7T0DdGWkJ7p7 TXHYHG+r0MpXhzy1AdJmf12IemonY4xkjz7t2MQCn9hBW5w9A5HQv4kIE/WZ6+Z+ tZ1yc0njDvenValKR9I+kUFrlDPhZzGydDB8G916q5mXiek5ajBIHmFXLSSyJi3w p1m6WouJRc7dsZ0EoL5V5VrRkWFOkw== =2+PQ -----END PGP SIGNATURE----- --nextPart2009678.9o76ZdvQCi--