CVS commit: pkgsrc/mk/compiler

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Mar  7 15:18:19 UTC 2020

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

Log Message:
Test that the lang/gccN exists before defaulting to N as the gfortran version.

Issue most immediately obvious when trying GCC 9, but probably applies to
some other versions as well.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 pkgsrc/mk/compiler/gfortran.mk:1.12
--- pkgsrc/mk/compiler/gfortran.mk:1.11 Wed Feb 26 15:58:20 2020
+++ pkgsrc/mk/compiler/gfortran.mk      Sat Mar  7 15:18:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.11 2020/02/26 15:58:20 bacon Exp $
+# $NetBSD: gfortran.mk,v 1.12 2020/03/07 15:18:19 maya Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,8 +36,11 @@ COMPILER_GFORTRAN_MK=        defined
 # 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-//}
+POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:C/.[0-9].[0-9]//:S/gcc-//}
+
+.if (${PKGSRC_COMPILER} == gcc) && \
+    exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk)
+GFORTRAN_VERSION?=             ${POSSIBLE_GFORTRAN_VERSION}
 .else
 GFORTRAN_VERSION?=     7
 .endif