Tue Nov 7 11:36:57 2023 UTC ()

Default to python 3.10 if compiler lacks c11 support.


(nia)

diff -r1.156 -r1.157 pkgsrc/lang/python/pyversion.mk
diff -r1.264 -r1.265 pkgsrc/mk/compiler/gcc.mk

--- pkgsrc/lang/python/pyversion.mk 2023/10/02 20:10:38 1.156
+++ pkgsrc/lang/python/pyversion.mk 2023/11/07 11:36:57 1.157

 @@ -1,14 +1,14 @@
-# $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
 # package that produces a binary that embeds python.
 # It determines which Python version is used as a dependency for
 # a package.
+#
 # === User-settable variables ===
+#
 # PYTHON_VERSION_DEFAULT
 #	The preferred Python version to use.
+#
 #	Possible values: 27 38 39 310 311 312
 @@ -92,27 +92,31 @@ PYTHON_VERSION_REQD?=	${PKGNAME_REQD:C/(
 .elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
       defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
 PYTHON_VERSION_REQD?=	${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
 .elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9][0-9]-*) || \
       defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9][0-9]-*)
 PYTHON_VERSION_REQD?=	${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9][0-9])-.*/\2/}
 .endif
 .include "../../mk/bsd.prefs.mk"
 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
 # transform the list into individual variables
 .for pv in ${PYTHON_VERSIONS_ACCEPTED}
 .  if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
 _PYTHON_VERSION_${pv}_OK=	yes
 _PYTHON_VERSIONS_ACCEPTED+=	${pv}
 .  endif
 .endfor
+#
 # choose a python version where to add,

--- pkgsrc/mk/compiler/gcc.mk 2023/11/07 09:54:49 1.264
+++ pkgsrc/mk/compiler/gcc.mk 2023/11/07 11:36:57 1.265

 @@ -1,14 +1,14 @@
-# $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.
+#
 # User-settable variables:
+#
 # GCCBASE
 #	If using a native GCC and the compiler is not in $PATH then
 #	this should be set to the base installation directory.
+#
 # USE_NATIVE_GCC
 #	When set to "yes", the native gcc is used, no matter which
 #	compiler version a package requires.
+#
 @@ -325,26 +325,32 @@ _GCC_VERSION=	0
 .endif
 _GCC_PKG=	gcc-${_GCC_VERSION:C/-.*$//}
 .if !empty(_GCC_VERSION:M[23]\..*) || !empty(_GCC_VERSION:M4.[01]\..*)
 # A lot of packages attempt to do this as a workaround for a
 # well-intentioned default in XCode 12+, but it's a common cause of
 # build failures on old versions of Darwin which use gcc and don't
 # understand this syntax.
+#
 # Note that pkgsrc also sets this flag itself for Darwin+clang.
 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
 # XXX: pkgsrc historically hardcoded c99=gnu99 so we retain that for now, but
 # we should look at removing this and be explicit in packages where required.
 _C_STD_FLAG.c99=	-std=gnu99
 .for _version_ in ${_CXX_STD_VERSIONS}
 _CXX_STD_FLAG.${_version_}?=	-std=${_version_}
 .endfor
 .if !empty(_GCC_VERSION:M[34].[1234].*)
 _CXX_STD_FLAG.c++03=	-std=c++0x
 _CXX_STD_FLAG.gnu++03=	-std=gnu++0x