CVS commit: pkgsrc/mk

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Jan  3 08:11:51 UTC 2024

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

Log Message:
(mk/compiler.mk, mk/compiler/gcc.mk) Add c17 on USE_CC_FEATURES (Re: gcc-10.x


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/mk/compiler.mk
cvs rdiff -u -r1.269 -r1.270 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.mk
diff -u pkgsrc/mk/compiler.mk:1.108 pkgsrc/mk/compiler.mk:1.109
--- pkgsrc/mk/compiler.mk:1.108 Tue Dec 12 16:28:45 2023
+++ pkgsrc/mk/compiler.mk       Wed Jan  3 08:11:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.108 2023/12/12 16:28:45 gdt Exp $
+# $NetBSD: compiler.mk,v 1.109 2024/01/03 08:11:51 mef Exp $
 #
 # This Makefile fragment implements handling for supported C/C++/Fortran
 # compilers.
@@ -78,7 +78,7 @@
 #      This is used to (optionally) install a newer compiler
 #      than provided by the system, or to skip building the package.
 #
-#      Valid values are: c11, c99, has_include.
+#      Valid values are: c11, c17, c99, has_include.
 #
 # USE_CXX_FEATURES
 #

Index: pkgsrc/mk/compiler/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.269 pkgsrc/mk/compiler/gcc.mk:1.270
--- pkgsrc/mk/compiler/gcc.mk:1.269     Tue Jan  2 23:37:48 2024
+++ pkgsrc/mk/compiler/gcc.mk   Wed Jan  3 08:11:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.269 2024/01/02 23:37:48 gdt Exp $
+# $NetBSD: gcc.mk,v 1.270 2024/01/03 08:11:51 mef Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -215,6 +215,13 @@ GCC_REQD+= 3
 GCC_REQD+=     4.9
 .endif
 
+.if !empty(USE_CC_FEATURES:Mc17)
+# See http://mail-index.netbsd.org/pkgsrc-users/2024/01/02/msg038697.html
+# Actually gcc-9.x is enough, but it is not in any NetBSD
+# base system, thus for convenience
+GCC_REQD+=     10.0
+.endif
+
 .if !empty(USE_CXX_FEATURES:Munique_ptr)
 GCC_REQD+=     4.9
 .endif