Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DD00E84ED2 for ; Sat, 4 Nov 2023 12:50:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id OeNobYcgN-dk for ; Sat, 4 Nov 2023 12:50:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5608484EAA for ; Sat, 4 Nov 2023 12:50:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A12EFA2B; Sat, 4 Nov 2023 12:50:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1699102206169090" MIME-Version: 1.0 Date: Sat, 4 Nov 2023 12:50:06 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/mk/compiler To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20231104125006.4A12EFA2B@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1699102206169090 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1699102206169090 Content-Disposition: inline Content-Length: 1033 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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) || \ --_----------=_1699102206169090--