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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E800D15808B for ; Wed, 16 Feb 2022 17:58:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B133E0839; Wed, 16 Feb 2022 17:58:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDED5E0814 for ; Wed, 16 Feb 2022 17:58:46 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] cmake.eclass: Fix MYCMAKEARGS breakage with >=dev-util/cmake-3.23 Date: Wed, 16 Feb 2022 18:58:20 +0100 Message-ID: <2181564.vFx2qVVIhK@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="nextPart2590256.lGaqSPkdTl"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: 9915f286-91d8-465d-8862-e89390f2508e X-Archives-Hash: b988607d6256fbc21f9aecfd94599c4a --nextPart2590256.lGaqSPkdTl Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [PATCH] cmake.eclass: Fix MYCMAKEARGS breakage with >=dev-util/cmake-3.23 Date: Wed, 16 Feb 2022 18:58:20 +0100 Message-ID: <2181564.vFx2qVVIhK@tuxbrain> I'm not sure what this variable is about, but we gotta fix it. ...and rather drop on next EAPI bump. Bug: https://bugs.gentoo.org/833100 Signed-off-by: Andreas Sturmlechner --- eclass/cmake.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 36f2621e19..64a2931898 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -593,9 +593,12 @@ cmake_src_configure() { "${mycmakeargs_local[@]}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" - "${MYCMAKEARGS}" ) + if [[ -n ${MYCMAKEARGS} ]] ; then + cmakeargs+=( "${MYCMAKEARGS}" ) + fi + if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" ) fi -- 2.35.1 --nextPart2590256.lGaqSPkdTl Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEexlipVqzuLtTjHMOREsPlv/SLMsFAmINOzxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDdC MTk2MkE1NUFCM0I4QkI1MzhDNzMwRTQ0NEIwRjk2RkZEMjJDQ0IACgkQREsPlv/S LMs5TAgAit0sAJgQkenLvKzXfmosT3WXv7ao6BUa6SaMiS00uNDoUAW7ZmRMFeGE ldQ6hGi2jiZdmVvQ22FfI+7u/qqOFcuTwPbUi21WpRjs57J9qDUx+D+bdKuntdaG XuuMwCwygu2ZpqEZnoBYa0OSVX/OQZkN2V43rqDftr+hRu207ss1fn1BKMCkcR1L 8rAgRDB5ozYb9DUgJfkQyY/9b6QFsP92AixKr1OtwEhCjhe9j9Gbcs5Y0bYNLt9s UnabfLd8kSEGBUZIuvJ5tq2yKCslWWv6821dGS5PFsnKysp/iLVskPmbGHVJEGv+ 9fVJREymoqOXs9dujnh+T64mUSkI8g== =htEF -----END PGP SIGNATURE----- --nextPart2590256.lGaqSPkdTl--