public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Andreas Sturmlechner <asturm@gentoo.org>
To: gentoo-dev@lists.gentoo.org, kde@gentoo.org, base-system@gentoo.org
Subject: [gentoo-dev] [PATCH 4/5] cmake.eclass: Avoid none-detection by ensuring match starts w/ digit
Date: Sun, 15 Jun 2025 22:31:34 +0200	[thread overview]
Message-ID: <8548962.T7Z3S40VBb@tuxbrain.fritz.box> (raw)
In-Reply-To: <12693580.O9o76ZdvQC@tuxbrain.fritz.box>

[-- Attachment #1: Type: text/plain, Size: 868 bytes --]

Thanks-to: Ionen Wolkens <ionen@gentoo.org>
Closes: https://bugs.gentoo.org/957990
Bug: https://bugs.gentoo.org/958051
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/cmake.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index ffd11bc0c863..d61992576565 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -336,7 +336,7 @@ _cmake_check_build_dir() {
 # Returns 0 if the regex matched (a lower-than-specified version found).
 _cmake_minreqver-lt() {
 	local ver chk=1
-	ver=$(sed -ne "/cmake_minimum_required/I{s/.*\(\.\.\.*\|\s\)\([0-9.]*\)\([)]\|\s\).*$/\2/p;q}" \
+	ver=$(sed -ne "/cmake_minimum_required/I{s/.*\(\.\.\.*\|\s\)\([0-9][0-9.]*\)\([)]\|\s\).*$/\2/p;q}" \
 		"${2}" 2>/dev/null \
 	)
 	if [[ -n ${ver} ]] && ver_test "${ver}" -lt "${1}"; then
-- 
2.49.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 789 bytes --]

  parent reply	other threads:[~2025-06-15 20:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-15 20:26 [gentoo-dev] [PATCH 1/5] cmake.eclass: Improve _cmake_modify-cmakelists(), consolidate the sed Andreas Sturmlechner
2025-06-15 20:30 ` [gentoo-dev] [PATCH 2/5] cmake.eclass: Introduce _CMAKE_MINREQVER_UNSUPPORTED Andreas Sturmlechner
2025-06-15 20:31 ` [gentoo-dev] [PATCH 3/5] cmake.eclass: mv _CMAKE_MINREQVER_UNSUPPORTED detection to src_prepare Andreas Sturmlechner
2025-06-15 20:31 ` Andreas Sturmlechner [this message]
2025-06-15 20:31 ` [gentoo-dev] [PATCH 5/5] cmake.eclass: Add src_install() check for CMake-4-incompatible modules Andreas Sturmlechner
2025-06-16  5:19 ` [gentoo-dev] [PATCH 1/5] cmake.eclass: Improve _cmake_modify-cmakelists(), consolidate the sed Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8548962.T7Z3S40VBb@tuxbrain.fritz.box \
    --to=asturm@gentoo.org \
    --cc=base-system@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    --cc=kde@gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox