CVS commit: pkgsrc/mk/compiler

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov  4 12:50:06 UTC 2023

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

Log Message:
gfortran.mk: Change fallback version from 7 to 10

gfortran.mk has code to choose the version of gfortran (really, the
version of pkgsrc gcc from which to use gfortran), and the first plan
is to match the gcc version in use.  Only if that version is not
available does it use a fallback version.  That used to be 7, back
when 7 was the standard relatively modern approach.  Today, 10 is the
standard approach for reasonably-up-to-date but not super-new gcc.

As proposed on tech-pkg on with no objections.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/mk/compiler/gfortran.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/gfortran.mk
diff -u pkgsrc/mk/compiler/gfortran.mk:1.25 pkgsrc/mk/compiler/gfortran.mk:1.26
--- pkgsrc/mk/compiler/gfortran.mk:1.25 Tue Oct 31 13:47:56 2023
+++ pkgsrc/mk/compiler/gfortran.mk      Sat Nov  4 12:50:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.25 2023/10/31 13:47:56 gdt Exp $
+# $NetBSD: gfortran.mk,v 1.26 2023/11/04 12:50:06 gdt Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -59,12 +59,12 @@ POSSIBLE_GFORTRAN_VERSION=  10
 .endif
 
 # If we are using gcc, and the POSSIBLE version exists in pkgsrc, use it.
-# Otherwise, pick gcc 7.  \todo Revisit this choice.
+# Otherwise, pick gcc 10 as a mainstream default.
 .if !empty(PKGSRC_COMPILER:Mgcc) && \
     exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk)
 GFORTRAN_VERSION?=             ${POSSIBLE_GFORTRAN_VERSION}
 .else
-GFORTRAN_VERSION?=             7
+GFORTRAN_VERSION?=             10
 .endif
 
 .if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \