Thu Aug 18 10:01:31 2011 UTC ()
Update _GCC_DIST_VERSION to 4.6.1.
Noted by J旦rn Clausen in PR 45256.


(wiz)
diff -r1.109 -r1.110 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.109 -r1.110 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2011/06/10 08:59:58 1.109
+++ pkgsrc/mk/compiler/gcc.mk 2011/08/18 10:01:31 1.110
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.109 2011/06/10 08:59:58 wiz Exp $ 1# $NetBSD: gcc.mk,v 1.110 2011/08/18 10:01:31 wiz 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# USE_NATIVE_GCC 7# USE_NATIVE_GCC
8# When set to "yes", the native gcc is used, no matter which 8# When set to "yes", the native gcc is used, no matter which
9# compiler version a package requires. 9# compiler version a package requires.
10# 10#
11# Package-settable variables: 11# Package-settable variables:
12# 12#
13# GCC_REQD 13# GCC_REQD
14# The minimum version of the GNU Compiler Collection that is 14# The minimum version of the GNU Compiler Collection that is
@@ -63,27 +63,27 @@ _DEF_VARS.gcc= \ @@ -63,27 +63,27 @@ _DEF_VARS.gcc= \
63 63
64USE_NATIVE_GCC?= no 64USE_NATIVE_GCC?= no
65 65
66GCC_REQD+= 2.8.0 66GCC_REQD+= 2.8.0
67 67
68# gcc2 doesn't support c99 and amd64 68# gcc2 doesn't support c99 and amd64
69.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64" 69.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
70GCC_REQD+= 3.0 70GCC_REQD+= 3.0
71.endif 71.endif
72 72
73# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc 73# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
74# without the PKGREVISIONs. 74# without the PKGREVISIONs.
75# 75#
76_GCC_DIST_VERSION= 4.6.0 76_GCC_DIST_VERSION= 4.6.1
77 77
78# _GCC2_PATTERNS matches N s.t. N <= 2.95.3. 78# _GCC2_PATTERNS matches N s.t. N <= 2.95.3.
79_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \ 79_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \
80 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3] 80 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3]
81 81
82# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4. 82# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4.
83_GCC3_PATTERNS= 2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].* \ 83_GCC3_PATTERNS= 2.95.[4-9]* 2.95.[1-9][0-9]* 2.9[6-9] 2.9[6-9].* \
84 2.[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].* 84 2.[1-9][0-9][0-9]* 3.[0-3] 3.[0-3].*
85 85
86# _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4. 86# _GCC34_PATTERNS matches N s.t. 3.4 <= N < 4.
87_GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]* 87_GCC34_PATTERNS= 3.[4-9] 3.[4-9].* 3.[1-9][0-9]*
88 88
89# _GCC44_PATTERNS matches N s.t. 4.4 <= N < 4.5. 89# _GCC44_PATTERNS matches N s.t. 4.4 <= N < 4.5.