From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 565EA1580F6 for ; Mon, 19 May 2025 18:47:56 +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 3C6BE34313F for ; Mon, 19 May 2025 18:47:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 073C01104A8; Mon, 19 May 2025 18:47:11 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 5402D1103DD for ; Mon, 19 May 2025 18:47:10 +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 644C43430C8; Mon, 19 May 2025 18:47:09 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org, kde@gentoo.org, base-system@gentoo.org Subject: Re: [gentoo-dev] [PATCH v2 3/3] cmake.eclass: Add CMAKE_QA_COMPAT_SKIP flag to skip compat checks Date: Mon, 19 May 2025 20:47:05 +0200 Message-ID: <2233502.irdbgypaU6@tuxbrain.fritz.box> In-Reply-To: <6166619.lOV4Wx5bFT@tuxbrain.fritz.box> References: <12677532.O9o76ZdvQC@tuxbrain.fritz.box> <6166619.lOV4Wx5bFT@tuxbrain.fritz.box> 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="nextPart13774079.uLZWGnKmhe"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: 3eef5a69-d19d-4fb1-a024-5993a8bf3ef3 X-Archives-Hash: 41d81ea6a71603a2a78e37c085127209 --nextPart13774079.uLZWGnKmhe Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Andreas Sturmlechner Date: Mon, 19 May 2025 20:47:05 +0200 Message-ID: <2233502.irdbgypaU6@tuxbrain.fritz.box> In-Reply-To: <6166619.lOV4Wx5bFT@tuxbrain.fritz.box> MIME-Version: 1.0 --- eclass/cmake.eclass | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 8e3454fca5..d9013fbc01 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 @@ -364,15 +370,16 @@ cmake_src_configure() { local file re="cmake_minimum_required *\( *VERSION( .*\.\.\.| )(([[:digit:]]+)\.([[:digit:]]+))" local ver cmreq_isold - while read -d '' -r file ; do - [[ $(grep -hi "cmake_minimum_required" "$file") =~ $re ]] - ver="${BASH_REMATCH[2]}" - echo $file $ver - - 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 + [[ $(grep -hi "cmake_minimum_required" "$file") =~ $re ]] + ver="${BASH_REMATCH[2]}" + + 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 --nextPart13774079.uLZWGnKmhe Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEEmaksxp6GvcraXyZQrlkbvHPk3V4FAmgrfKlfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk5 QTkyQ0M2OUU4NkJEQ0FEQTVGMjY1MEFFNTkxQkJDNzNFNERENUUACgkQrlkbvHPk 3V5FVwv+NEnnHv6p0X+7nw3SiVwbAjZfHD8Px93bsTCghB10dnCh/uQNVij4nH5G 6gXxvxo3Q+RXM9dvFP5m9RaoCI5XjUNzgW8hJFOfPuplinVJqcPtqWD2K7Oo8W6t 2UahgtK0XnMFpYMgZOKkGvkwh7Djz336q/Ze2PlpQOE+5CwWnlMtkKY9ayqiCe0W DimUdEbJ9gOG6txM63jXQVI6+ixm9uz4SbjEZ5MV0d+1YO2b86eIfd+wIJUsYumQ axZ2N2C5P6llkATipoGp8RtIoFBRbf8kXZnXEtTbCRcngCXlj/eG5yVFiWzxik8U t0oZFeWMr6HesC5fQYSKGG7Bji//BRnUz1bak42hZd0ckKb8ILC8kEUTrYwh3fKX Yx2yUktRLkcC5kvnZ3Rwp+tWFQCqaiumEdakMJ/AMOoicVRXYdWz7HTw6eb5jtmu LtHmNbAUTmqob+VBz7ML0tyQR9pORGHmPS1ha5zkoo8fpraeRyZCadDiL8Wxy6cc DfJJiA2f =uvY0 -----END PGP SIGNATURE----- --nextPart13774079.uLZWGnKmhe--