CVS commit: pkgsrc/mk/compiler

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 15 13:45:12 UTC 2026

Modified Files:
        pkgsrc/mk/compiler: gcc.mk

Log Message:
mk: avoid a fork when comparing installed gcc versions against GCC_REQD


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 pkgsrc/mk/compiler/gcc.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.303 pkgsrc/mk/compiler/gcc.mk:1.304
--- pkgsrc/mk/compiler/gcc.mk:1.303     Sun Jan 11 15:30:28 2026
+++ pkgsrc/mk/compiler/gcc.mk   Thu Jan 15 13:45:12 2026
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.303 2026/01/11 15:30:28 wiz Exp $
+# $NetBSD: gcc.mk,v 1.304 2026/01/15 13:45:12 wiz Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -85,10 +85,10 @@ _DEF_VARS.gcc=      \
        _GCCBINDIR _GCC_ARCHDIR _GCC_BIN_PREFIX _GCC_CFLAGS \
        _GCC_CC _GCC_CPP _GCC_CXX _GCC_DEPENDS \
        _GCC_DIST_NAME _GCC_DIST_VERSION \
-       _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG \
+       _GCC_FC _GCC_LDFLAGS _GCC_LIBDIRS _GCC_PKG _GCC_PKG_MAJOR_MINOR \
        _GCC_PKGBASE _GCC_PKGSRCDIR _GCC_PKG_SATISFIES_DEP \
        _GCC_PREFIX _GCC_REQD _GCC_STRICTEST_REQD _GCC_SUBPREFIX \
-       _GCC_TEST_DEPENDS _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
+       _GCC_NEEDS_A_FORTRAN _GCC_VARS _GCC_VERSION \
        _GCC_VERSION_STRING \
        _GCC_ADA _GCC_GMK _GCC_GLK _GCC_GBD _GCC_CHP _GCC_GLS _GCC_GNT _GCC_PRP \
        _IGNORE_GCC \
@@ -1051,13 +1051,12 @@ _USE_PKGSRC_GCC=        NO
 .if !defined(_USE_PKGSRC_GCC)
 _USE_PKGSRC_GCC=       YES
 .  if !empty(_IS_BUILTIN_GCC:M[yY][eE][sS])
-_GCC_TEST_DEPENDS=     gcc>=${_GCC_REQD}
-_USE_PKGSRC_GCC!=      \
-       if ${PKG_ADMIN} pmatch '${_GCC_TEST_DEPENDS}' ${_GCC_PKG} 2>/dev/null; then \
-               ${ECHO} "NO";                                           \
-       else                                                            \
-               ${ECHO} "YES";                                          \
-       fi
+_GCC_PKG_MAJOR_MINOR=${_GCC_PKG:C/gcc-([0-9]+\.[0-9]+).*/\1/}
+.    if ${_GCC_PKG_MAJOR_MINOR:R} > ${_GCC_REQD:R} || (${_GCC_PKG_MAJOR_MINOR:R} == ${_GCC_REQD:R} && ${_GCC_PKG_MAJOR_MINOR:E} >= ${_GCC_REQD:E})
+_USE_PKGSRC_GCC=       NO
+.    else
+_USE_PKGSRC_GCC=       YES
+.    endif
 .  endif
 .endif