CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Oct  9 13:36:13 UTC 2023

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

Log Message:
mk: Limit USE_PKGSRC_GCC defaults for gcc12/13 to NetBSD

Not correct logic (actual gcc version should be checked),
but should at least unbreak things on other platforms for now.

Requested by jperkin.


To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 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.262 pkgsrc/mk/compiler/gcc.mk:1.263
--- pkgsrc/mk/compiler/gcc.mk:1.262     Sat Aug 26 09:49:55 2023
+++ pkgsrc/mk/compiler/gcc.mk   Mon Oct  9 13:36:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.262 2023/08/26 09:49:55 wiz Exp $
+# $NetBSD: gcc.mk,v 1.263 2023/10/09 13:36:13 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -456,8 +456,11 @@ _NEED_GCC10=       yes
 _NEED_GCC12?=  no
 .for _pattern_ in ${_GCC12_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
+# XXX: pin to a version when NetBSD switches to gcc12
+.    if ${OPSYS} == "NetBSD"
 USE_PKGSRC_GCC=                yes
 USE_PKGSRC_GCC_RUNTIME=        yes
+.    endif
 .    if ${ALLOW_NEWER_COMPILER:tl} != "yes"
 PKG_FAIL_REASON+=      "Package requires at least gcc 12 to build"
 .    endif
@@ -467,8 +470,11 @@ _NEED_GCC12=       yes
 _NEED_GCC13?=  no
 .for _pattern_ in ${_GCC13_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
+# XXX: pin to a version when NetBSD switches to gcc13
+.    if ${OPSYS} == "NetBSD"
 USE_PKGSRC_GCC=                yes
 USE_PKGSRC_GCC_RUNTIME=        yes
+.    endif
 .    if ${ALLOW_NEWER_COMPILER:tl} != "yes"
 PKG_FAIL_REASON+=      "Package requires at least gcc 13 to build"
 .    endif