commit: 2e24587327724df1b3124baa2e8360e0fcaa9870
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 22:26:18 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
}