[pkgsrc/trunk]: pkgsrc/mk/compiler mk/compiler: Make gfortran the default for...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/74295d3ba6fc
branches:  trunk
changeset: 414543:74295d3ba6fc
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Mar 30 09:39:24 2020 +0000

description:
mk/compiler: Make gfortran the default fortran compiler.

Discussed on tech-pkg@ before freeze.

diffstat:

 mk/compiler/clang.mk |  6 +-----
 mk/compiler/gcc.mk   |  9 +--------
 2 files changed, 2 insertions(+), 13 deletions(-)

diffs (45 lines):

diff -r a22b00c048c0 -r 74295d3ba6fc mk/compiler/clang.mk
--- a/mk/compiler/clang.mk      Mon Mar 30 09:38:05 2020 +0000
+++ b/mk/compiler/clang.mk      Mon Mar 30 09:39:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.22 2020/03/14 10:00:37 nia Exp $
+# $NetBSD: clang.mk,v 1.23 2020/03/30 09:39:24 nia Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -84,11 +84,7 @@
 _LANGUAGES.clang+=     ${LANGUAGES.clang:M${_lang_}}
 .endfor
 
-.if !empty(MACHINE_ARCH:Maarch64*)
 PKGSRC_FORTRAN?=gfortran
-.else
-PKGSRC_FORTRAN?=g95
-.endif
 
 .if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77))
 .  include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
diff -r a22b00c048c0 -r 74295d3ba6fc mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Mon Mar 30 09:38:05 2020 +0000
+++ b/mk/compiler/gcc.mk        Mon Mar 30 09:39:24 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.209 2020/03/14 10:00:37 nia Exp $
+# $NetBSD: gcc.mk,v 1.210 2020/03/30 09:39:24 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -1046,14 +1046,7 @@
 .endfor
 
 # On systems without a Fortran compiler, pull one in if needed.
-# The default is g95 as it supports a modern dialect, but it can
-# be overridden in mk.conf to use only f2c.
-#
-.if !empty(MACHINE_ARCH:Maarch64*)
 PKGSRC_FORTRAN?=gfortran
-.else
-PKGSRC_FORTRAN?=g95
-.endif
 
 _GCC_NEEDS_A_FORTRAN=  no
 .if empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) && !exists(${FCPATH})