Thu Jul 20 21:12:16 2023 UTC ()
mk: Most packages don't know to use the "experimental" header,
so just require gcc8 for std::filesystem.


(nia)
diff -r1.254 -r1.255 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.254 -r1.255 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2023/07/18 12:49:46 1.254
+++ pkgsrc/mk/compiler/gcc.mk 2023/07/20 21:12:16 1.255
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.254 2023/07/18 12:49:46 nia Exp $ 1# $NetBSD: gcc.mk,v 1.255 2023/07/20 21:12:16 nia Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -206,34 +206,27 @@ GCC_REQD+= 3 @@ -206,34 +206,27 @@ GCC_REQD+= 3
206.if !empty(USE_CC_FEATURES:Mc11) 206.if !empty(USE_CC_FEATURES:Mc11)
207GCC_REQD+= 4.9 207GCC_REQD+= 4.9
208.endif 208.endif
209 209
210.if !empty(USE_CXX_FEATURES:Munique_ptr) 210.if !empty(USE_CXX_FEATURES:Munique_ptr)
211GCC_REQD+= 4.9 211GCC_REQD+= 4.9
212.endif 212.endif
213 213
214.if !empty(USE_CXX_FEATURES:Mregex) 214.if !empty(USE_CXX_FEATURES:Mregex)
215GCC_REQD+= 4.9 215GCC_REQD+= 4.9
216.endif 216.endif
217 217
218.if !empty(USE_CXX_FEATURES:Mfilesystem) 218.if !empty(USE_CXX_FEATURES:Mfilesystem)
219# std::filesystem was "experimental" in gcc7 and NetBSD 9 shipped 
220# GCC without the experimental C++ library headers (a break from 
221# upstream). 
222. if ${OPSYS} == "NetBSD" 
223GCC_REQD+= 8 219GCC_REQD+= 8
224. else 
225GCC_REQD+= 7 
226. endif 
227.endif 220.endif
228 221
229.if !empty(USE_CXX_FEATURES:Mparallelism_ts) 222.if !empty(USE_CXX_FEATURES:Mparallelism_ts)
230GCC_REQD+= 10 223GCC_REQD+= 10
231.endif 224.endif
232 225
233.if !empty(USE_CXX_FEATURES:Mcharconv) 226.if !empty(USE_CXX_FEATURES:Mcharconv)
234GCC_REQD+= 8 227GCC_REQD+= 8
235.endif 228.endif
236 229
237# Only one compiler defined here supports Ada: lang/gcc6-aux 230# Only one compiler defined here supports Ada: lang/gcc6-aux
238# If the Ada language is requested, force lang/gcc6-aux to be selected 231# If the Ada language is requested, force lang/gcc6-aux to be selected
239.if !empty(USE_LANGUAGES:Mada) 232.if !empty(USE_LANGUAGES:Mada)