CVS commit: pkgsrc/mk/compiler

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct 20 19:35:07 UTC 2020

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

Log Message:
mk/compiler/gfortran.mk: bump default from gcc9 to gcc10 on current aarch64

lang/gcc8 has patches for NetBSD/aarch64 and lang/gcc10 has support mostly
upstreamed. Nobody seems interested in fixing gcc9, but the pkgsrc
logic defaults to it when the system compiler is GCC 9 which leads to
broken fortran packages. Let's just skip forward to gcc10.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 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.15 pkgsrc/mk/compiler/gfortran.mk:1.16
--- pkgsrc/mk/compiler/gfortran.mk:1.15 Thu Mar 26 12:44:46 2020
+++ pkgsrc/mk/compiler/gfortran.mk      Tue Oct 20 19:35:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.15 2020/03/26 12:44:46 gdt Exp $
+# $NetBSD: gfortran.mk,v 1.16 2020/10/20 19:35:07 tnn Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -41,6 +41,11 @@ COMPILER_GFORTRAN_MK=        defined
 # in that case.
 POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:S/gcc-//:C/.[0-9].[0-9]$//}
 
+# gcc9 doesn't work on NetBSD/aarch64, but gcc10 does.
+.if !empty(POSSIBLE_GFORTRAN_VERSION:M9) && !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
+POSSIBLE_GFORTRAN_VERSION=     10
+.endif
+
 .if !empty(PKGSRC_COMPILER:Mgcc) && \
     exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk)
 GFORTRAN_VERSION?=             ${POSSIBLE_GFORTRAN_VERSION}