CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov  7 11:36:57 UTC 2023

Modified Files:
        pkgsrc/lang/python: pyversion.mk
        pkgsrc/mk/compiler: gcc.mk

Log Message:
Default to python 3.10 if compiler lacks c11 support.


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.264 -r1.265 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/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.156 pkgsrc/lang/python/pyversion.mk:1.157
--- pkgsrc/lang/python/pyversion.mk:1.156       Mon Oct  2 20:10:38 2023
+++ pkgsrc/lang/python/pyversion.mk     Tue Nov  7 11:36:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.156 2023/10/02 20:10:38 adam Exp $
+# $NetBSD: pyversion.mk,v 1.157 2023/11/07 11:36:57 nia Exp $
 
 # This file should be included by packages as a way to depend on
 # python when none of the other methods are appropriate, e.g. a
@@ -102,7 +102,11 @@ PYTHON_VERSION_REQD?=      ${PKGNAME_OLD:C/(^
 BUILD_DEFS+=           PYTHON_VERSION_DEFAULT
 BUILD_DEFS_EFFECTS+=   PYPACKAGE
 
+.if ${COMPILER_HAS_C11:Uyes} != "no"
 PYTHON_VERSION_DEFAULT?=               311
+.else
+PYTHON_VERSION_DEFAULT?=               310
+.endif
 PYTHON_VERSIONS_ACCEPTED?=             312 311 310 39 38 27
 PYTHON_VERSIONS_INCOMPATIBLE?=         # empty by default
 

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.264 pkgsrc/mk/compiler/gcc.mk:1.265
--- pkgsrc/mk/compiler/gcc.mk:1.264     Tue Nov  7 09:54:49 2023
+++ pkgsrc/mk/compiler/gcc.mk   Tue Nov  7 11:36:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.264 2023/11/07 09:54:49 nia Exp $
+# $NetBSD: gcc.mk,v 1.265 2023/11/07 11:36:57 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -335,6 +335,12 @@ _GCC_PKG=  gcc-${_GCC_VERSION:C/-.*$//}
 BUILDLINK_TRANSFORM+=  rm:-Wno-error=implicit-function-declaration
 .endif
 
+.if !empty(_GCC_VERSION:M[23]\..*) || !empty(_GCC_VERSION:M4.[0-8]\..*)
+COMPILER_HAS_C11?=     no
+.else
+COMPILER_HAS_C11?=     yes
+.endif
+
 .for _version_ in ${_C_STD_VERSIONS}
 _C_STD_FLAG.${_version_}?=     -std=${_version_}
 .endfor