From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-dev+bounces-103672-garchives=archives.gentoo.org@lists.gentoo.org> 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CBD2F1580E0 for <garchives@archives.gentoo.org>; Mon, 02 Jun 2025 20:48:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 92FE7343179 for <garchives@archives.gentoo.org>; Mon, 02 Jun 2025 20:48:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4872F1104A7; Mon, 02 Jun 2025 20:47:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 89B1B1102CD for <gentoo-dev@lists.gentoo.org>; Mon, 02 Jun 2025 20:47:33 +0000 (UTC) Received: from tuxbrain.fritz.box (unknown [IPv6:2a04:9546:191d:b501:676c:7b0c:c3fa:aa8e]) (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) (Authenticated sender: asturm) by smtp.gentoo.org (Postfix) with ESMTPSA id 9A44C33BEA5; Mon, 02 Jun 2025 20:47:32 +0000 (UTC) From: Andreas Sturmlechner <asturm@gentoo.org> To: gentoo-dev@lists.gentoo.org, kde@gentoo.org, base-system@gentoo.org Subject: [gentoo-dev] [PATCH v3 3/3] cmake.eclass: Add CMAKE_QA_COMPAT_SKIP flag to skip compat checks Date: Mon, 02 Jun 2025 22:47:29 +0200 Message-ID: <8545610.T7Z3S40VBb@tuxbrain.fritz.box> In-Reply-To: <1934159.tdWV9SEqCh@tuxbrain.fritz.box> References: <12677532.O9o76ZdvQC@tuxbrain.fritz.box> <1934159.tdWV9SEqCh@tuxbrain.fritz.box> Precedence: bulk List-Post: <mailto:gentoo-dev@lists.gentoo.org> List-Help: <mailto:gentoo-dev+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org> 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="nextPart10678411.nUPlyArG6x"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: 034c08a1-54eb-4f0b-b098-d1ed0837d344 X-Archives-Hash: 35e7cb0c830e2ca02b253d51508274d0 --nextPart10678411.nUPlyArG6x Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Andreas Sturmlechner <asturm@gentoo.org> Date: Mon, 02 Jun 2025 22:47:29 +0200 Message-ID: <8545610.T7Z3S40VBb@tuxbrain.fritz.box> In-Reply-To: <1934159.tdWV9SEqCh@tuxbrain.fritz.box> MIME-Version: 1.0 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> --- eclass/cmake.eclass | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index b538af80a4b1..f327521e9fc1 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -117,6 +117,12 @@ fi # for econf and is needed to pass TRY_RUN results when cross-compiling. # Should be set by user in a per-package basis in /etc/portage/package.env. +# @ECLASS_VARIABLE: CMAKE_QA_COMPAT_SKIP +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set, skip detection of CMakeLists.txt unsupported in CMake 4 in case of +# false positives (e.g. unused outdated bundled libs). + # @ECLASS_VARIABLE: CMAKE_QA_SRC_DIR_READONLY # @USER_VARIABLE # @DEFAULT_UNSET @@ -446,15 +452,17 @@ cmake_src_configure() { xdg_environment_reset local file ver cmreq_isold - while read -d '' -r file ; do - ver=$(sed -ne "/cmake_minimum_required/I{s/.*\(\.\.\.*\|\s\)\([0-9.]*\)\([)]\|\s\).*$/\2/p;q}" \ - "${file}" 2>/dev/null \ - ) - - if [[ -n $ver ]] && ver_test $ver -lt "3.5"; then - cmreq_isold=true - fi - done < <(find "${CMAKE_USE_DIR}" -type f -iname "CMakeLists.txt" -print0) + if ! [[ ${CMAKE_QA_COMPAT_SKIP} ]]; then + while read -d '' -r file ; do + ver=$(sed -ne "/cmake_minimum_required/I{s/.*\(\.\.\.*\|\s\)\([0-9.]*\)\([)]\|\s\).*$/\2/p;q}" \ + "${file}" 2>/dev/null \ + ) + + if [[ -n $ver ]] && ver_test $ver -lt "3.5"; then + cmreq_isold=true + fi + done < <(find "${CMAKE_USE_DIR}" -type f -iname "CMakeLists.txt" -print0) + fi # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${BUILD_DIR}/gentoo_rules.cmake -- 2.49.0 --nextPart10678411.nUPlyArG6x Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEEmaksxp6GvcraXyZQrlkbvHPk3V4FAmg+DeFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk5 QTkyQ0M2OUU4NkJEQ0FEQTVGMjY1MEFFNTkxQkJDNzNFNERENUUACgkQrlkbvHPk 3V6G8QwAhvS5CFTYelI59abr/vn2OlXi8+CUzVP9k7yRNhU8f+9bSttojgIZZH4m 0H1GhNukc2O2EwZJyD9OJMzNmsdP0jHgTMN5i+ArT6VZhgfduuovKf59/pLNjSLG P8YOOhABYhgin1kpa37Az4K6lAYxnnytuXTV7GhQ5qWHsOFr7tt2e4uvbDmSMB+Q tDl89xxezj3eYNG+dsDejV8qrPPaK0W2NEnwc7SwZQEI4JAdJr9K9qJLVl3Hg3z0 v25cZQ3xOO/6jDy0dvXIbvpAdsSRROH+/33JsbfgEfhTxxDDRRpc/S63h96LiQB7 GgGJe3XBA/TeMHMth5SDKYMPTRa9j2BT4i+E47UGCKTNqHfVgWuab9FBvwDhNa2v oo3h+lyN5PSX1zTyZjwzCKTctw+bo0idz1QTbwIqiwHC4MIj+aGnwe6OIv+hNIOB mGxYjRtl/sE5RwrKYx5ljnpmMurIlCCgPqwBOmiPMIh87XrSKOQhfmUaEUDi+bRO miX08JfN =jWGJ -----END PGP SIGNATURE----- --nextPart10678411.nUPlyArG6x--