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 7F5771582EF for ; Sun, 09 Feb 2025 19:13:17 +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 63DA934313A for ; Sun, 09 Feb 2025 19:13:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 35CF7110471; Sun, 09 Feb 2025 19:13:13 +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 2B389110471 for ; Sun, 09 Feb 2025 19:13:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id D0BD8343118 for ; Sun, 09 Feb 2025 19:13:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08B152381 for ; Sun, 09 Feb 2025 19:13:11 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1739128332.2e24587327724df1b3124baa2e8360e0fcaa9870.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/ecm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2e24587327724df1b3124baa2e8360e0fcaa9870 X-VCS-Branch: master Date: Sun, 09 Feb 2025 19:13:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 129ac4f4-4574-4c0d-b907-2116434aef98 X-Archives-Hash: 45c5dec3023b0007c3ae945b783fdb0f commit: 2e24587327724df1b3124baa2e8360e0fcaa9870 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 17 22:26:18 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:12:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e245873 ecm.eclass: Replace KDE_GCC_MINIMAL logic with tc-check-min_ver Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/ecm.eclass | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index e433952903e8..876039705288 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -488,18 +488,9 @@ _ecm_deprecated_check_gcc_version() { if ver_test ${KFMIN} -ge 6.9; then eqawarn "QA notice: ecm_pkg_${1} has become a no-op." eqawarn "It is no longer being exported with KFMIN >=6.9.0." - return - fi - if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then - - local version=$(gcc-version) - - debug-print "GCC version check activated" - debug-print "Version detected: ${version}" - debug-print "Version required: ${KDE_GCC_MINIMAL}" - - ver_test ${version} -lt ${KDE_GCC_MINIMAL} && - die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package (found ${version})." + else + [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && + tc-check-min_ver gcc ${KDE_GCC_MINIMAL} fi }