CVS commit: pkgsrc/mk/compiler

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Mar 26 12:42:02 UTC 2020

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

Log Message:
mk/compiler/gfortran.mk: Fix bugs in version selection

Adjust regexp that removes .Y.Z from gcc-X.Y.Z.

Test for gcc being contained in PKGSRC_COMPILER, vs ==, so that a
value of "ccache gcc" is handled properly.

(ok for mk during freeze jperkin@)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 pkgsrc/mk/compiler/gfortran.mk:1.14
--- pkgsrc/mk/compiler/gfortran.mk:1.13 Sat Mar  7 15:19:20 2020
+++ pkgsrc/mk/compiler/gfortran.mk      Thu Mar 26 12:42:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.13 2020/03/07 15:19:20 maya Exp $
+# $NetBSD: gfortran.mk,v 1.14 2020/03/26 12:42:02 gdt Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -36,9 +36,9 @@ 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.
-POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:C/.[0-9].[0-9]//:S/gcc-//}
+POSSIBLE_GFORTRAN_VERSION?=    ${CC_VERSION:S/gcc-//:C/.[0-9].[0-9]$//}
 
-.if (${PKGSRC_COMPILER} == gcc) && \
+.if !empty(PKGSRC_COMPILER:Mgcc) && \
     exists(${PKGSRCDIR}/lang/gcc${POSSIBLE_GFORTRAN_VERSION}/buildlink3.mk)
 GFORTRAN_VERSION?=             ${POSSIBLE_GFORTRAN_VERSION}
 .else