CVS commit: pkgsrc/mk/compiler

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Wed Feb 26 15:58:20 UTC 2020

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

Log Message:
mk/compiler/gfortran: Default to same major version as base GCC

GFORTRAN_VERSION should match CC_VERSION as closely as possible for
ABI compatibility.  This update tries to match GFORTRAN_VERSION
to CC_VERSION if the base compiler is GCC.  If base compiler is not
GCC, default to a mainstream version likely to work with base clang/llvm.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 pkgsrc/mk/compiler/gfortran.mk:1.11
--- pkgsrc/mk/compiler/gfortran.mk:1.10 Wed Aug 22 20:48:37 2018
+++ pkgsrc/mk/compiler/gfortran.mk      Wed Feb 26 15:58:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.10 2018/08/22 20:48:37 maya Exp $
+# $NetBSD: gfortran.mk,v 1.11 2020/02/26 15:58:20 bacon Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -33,7 +33,14 @@ COMPILER_GFORTRAN_MK=        defined
 
 .include "../../mk/bsd.prefs.mk"
 
-GFORTRAN_VERSION?=     48
+# If pkgsrc base compiler is GCC, match the gfortran requirement as closely as
+# possible.  Otherwise, default to a mainstream version and hope for the best.
+# If base compiler is clang, we really should use flang rather than gfortran.
+.if ${PKGSRC_COMPILER} == gcc
+GFORTRAN_VERSION?=     ${CC_VERSION:C/.[0-9].[0-9]$//:S/gcc-//}
+.else
+GFORTRAN_VERSION?=     7
+.endif
 
 .if !empty(PKGPATH:Mlang/gcc${GFORTRAN_VERSION}) || !empty(PKGPATH:Mdevel/patch) || \
     !empty(PKGPATH:Mdevel/libtool-base)