CVS commit: pkgsrc/mk/compiler

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Apr  4 15:38:47 UTC 2022

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

Log Message:
mk: Fix malformed conditional.

There's no guarantee that POSSIBLE_GFORTRAN_VERSION is a numeric value,
so cannot be compared as such.  For example on my macOS it is set to
"clang-12 (clang-1205.0.22.9)".

This really needs to be normalised correctly at some point.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 pkgsrc/mk/compiler/gfortran.mk:1.20
--- pkgsrc/mk/compiler/gfortran.mk:1.19 Sat Apr  2 08:01:48 2022
+++ pkgsrc/mk/compiler/gfortran.mk      Mon Apr  4 15:38:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gfortran.mk,v 1.19 2022/04/02 08:01:48 nia Exp $
+# $NetBSD: gfortran.mk,v 1.20 2022/04/04 15:38:47 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -47,7 +47,7 @@ POSSIBLE_GFORTRAN_VERSION?=   ${CC_VERSION
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif
 
-.if ${POSSIBLE_GFORTRAN_VERSION} <= 9 && \
+.if !empty(POSSIBLE_GFORTRAN_VERSION:M[0-9]) && \
     !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
 POSSIBLE_GFORTRAN_VERSION=     10
 .endif