pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/compiler mk/compiler/gfortran.mk: bump default from...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/54ebbbd0f8c4
branches:  trunk
changeset: 440872:54ebbbd0f8c4
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Oct 20 19:35:07 2020 +0000

description:
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.

diffstat:

 mk/compiler/gfortran.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r a981b1e380c1 -r 54ebbbd0f8c4 mk/compiler/gfortran.mk
--- a/mk/compiler/gfortran.mk   Tue Oct 20 19:06:59 2020 +0000
+++ b/mk/compiler/gfortran.mk   Tue Oct 20 19:35:07 2020 +0000
@@ -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 @@
 # 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}



Home | Main Index | Thread Index | Old Index