Mon Apr 10 12:22:07 2017 UTC ()
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.


(jperkin)
diff -r1.174 -r1.175 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.174 -r1.175 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2016/12/29 23:16:26 1.174
+++ pkgsrc/mk/compiler/gcc.mk 2017/04/10 12:22:07 1.175
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.174 2016/12/29 23:16:26 maya Exp $ 1# $NetBSD: gcc.mk,v 1.175 2017/04/10 12:22:07 jperkin Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -110,31 +110,31 @@ _GCC_DIST_NAME:= gcc6 @@ -110,31 +110,31 @@ _GCC_DIST_NAME:= gcc6
110_GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:tu}_DIST_VERSION} 110_GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:tu}_DIST_VERSION}
111 111
112# _GCC2_PATTERNS matches N s.t. N <= 2.95.3. 112# _GCC2_PATTERNS matches N s.t. N <= 2.95.3.
113_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \ 113_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \
114 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3] 114 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3]
115 115
116# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4. 116# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4.
117_GCC3_PATTERNS= 2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].* \ 117_GCC3_PATTERNS= 2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].* \
118 2.[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].* 118 2.[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].*
119 119
120# _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4. 120# _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4.
121_GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]* 121_GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]*
122 122
123# _GCC44_PATTERNS matches N s.t. 4.4 <= N < 4.5. 123# _GCC44_PATTERNS matches N s.t. 4.0 <= N < 4.5.
124_GCC44_PATTERNS= 4.4 4.4.* 124_GCC44_PATTERNS= 4.[0-4] 4.[0-4].*
125 125
126# _GCC48_PATTERNS matches N s.t. 4.5 <= N < 4.9. 126# _GCC48_PATTERNS matches N s.t. 4.5 <= N < 4.9.
127_GCC48_PATTERNS= 4.[5678] 4.[5678].* 127_GCC48_PATTERNS= 4.[5-8] 4.[5-8].*
128 128
129# _GCC49_PATTERNS matches N s.t. 4.9 <= N < 4.10. 129# _GCC49_PATTERNS matches N s.t. 4.9 <= N < 4.10.
130_GCC49_PATTERNS= 4.9 4.9.* 130_GCC49_PATTERNS= 4.9 4.9.*
131 131
132# _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6. 132# _GCC5_PATTERNS matches N s.t. 5.0 <= N < 6.
133_GCC5_PATTERNS= 5.* 133_GCC5_PATTERNS= 5.*
134 134
135# _GCC6_PATTERNS matches N s.t. 6.0 <= N < 7. 135# _GCC6_PATTERNS matches N s.t. 6.0 <= N < 7.
136_GCC6_PATTERNS= 6.* 136_GCC6_PATTERNS= 6.*
137 137
138# _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD* 138# _GCC_AUX_PATTERNS matches 8-digit date YYYYMMDD*
139_GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]* 139_GCC_AUX_PATTERNS= 20[1-2][0-9][0-1][0-9][0-3][0-9]*
140 140