CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Apr 10 12:22:07 UTC 2017

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

Log Message:
Let GCC 4.4 handle requests for GCC 4.[0-4] to ensure we are consistent in
using the closest match for each request, as well as fixing platforms where
GCC 6 does not yet build or is unsupported.


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 pkgsrc/mk/compiler/gcc.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/gcc.mk
diff -u pkgsrc/mk/compiler/gcc.mk:1.174 pkgsrc/mk/compiler/gcc.mk:1.175
--- pkgsrc/mk/compiler/gcc.mk:1.174     Thu Dec 29 23:16:26 2016
+++ pkgsrc/mk/compiler/gcc.mk   Mon Apr 10 12:22:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.174 2016/12/29 23:16:26 maya Exp $
+# $NetBSD: gcc.mk,v 1.175 2017/04/10 12:22:07 jperkin Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -120,11 +120,11 @@ _GCC3_PATTERNS=   2.95.[4-9]* 2.95.[1-9][0
 # _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4.
 _GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]*
 
-# _GCC44_PATTERNS matches N s.t. 4.4 <= N < 4.5.
-_GCC44_PATTERNS= 4.4 4.4.*
+# _GCC44_PATTERNS matches N s.t. 4.0 <= N < 4.5.
+_GCC44_PATTERNS= 4.[0-4] 4.[0-4].*
 
 # _GCC48_PATTERNS matches N s.t. 4.5 <= N < 4.9.
-_GCC48_PATTERNS= 4.[5678] 4.[5678].*
+_GCC48_PATTERNS= 4.[5-8] 4.[5-8].*
 
 # _GCC49_PATTERNS matches N s.t. 4.9 <= N < 4.10.
 _GCC49_PATTERNS= 4.9 4.9.*