Fri Apr 2 16:54:48 2021 UTC ()
mk: use gcc6-aux for ada


(nia)
diff -r1.221 -r1.222 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.221 -r1.222 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2021/04/02 11:48:16 1.221
+++ pkgsrc/mk/compiler/gcc.mk 2021/04/02 16:54:48 1.222
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.221 2021/04/02 11:48:16 nia Exp $ 1# $NetBSD: gcc.mk,v 1.222 2021/04/02 16:54:48 nia 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#
@@ -134,30 +134,30 @@ _LISTED_VARS.gcc= \ @@ -134,30 +134,30 @@ _LISTED_VARS.gcc= \
134.include "../../mk/bsd.prefs.mk" 134.include "../../mk/bsd.prefs.mk"
135 135
136USE_NATIVE_GCC?= no 136USE_NATIVE_GCC?= no
137USE_PKGSRC_GCC?= no 137USE_PKGSRC_GCC?= no
138USE_PKGSRC_GCC_RUNTIME?=no 138USE_PKGSRC_GCC_RUNTIME?=no
139 139
140GCC_REQD+= 2.8.0 140GCC_REQD+= 2.8.0
141 141
142# gcc2 doesn't support c99 and amd64 142# gcc2 doesn't support c99 and amd64
143.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64" 143.if !empty(USE_LANGUAGES:Mc99) || ${MACHINE_ARCH} == "x86_64"
144GCC_REQD+= 3.0 144GCC_REQD+= 3.0
145.endif 145.endif
146 146
147# Only one compiler defined here supports Ada: lang/gcc5-aux 147# Only one compiler defined here supports Ada: lang/gcc6-aux
148# If the Ada language is requested, force lang/gcc5-aux to be selected 148# If the Ada language is requested, force lang/gcc6-aux to be selected
149.if !empty(USE_LANGUAGES:Mada) 149.if !empty(USE_LANGUAGES:Mada)
150GCC_REQD+= 20120614 150GCC_REQD+= 20160822
151.endif 151.endif
152 152
153# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc 153# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
154# without the PKGREVISIONs. 154# without the PKGREVISIONs.
155_GCC_DIST_NAME:= gcc10 155_GCC_DIST_NAME:= gcc10
156.include "../../lang/${_GCC_DIST_NAME}/version.mk" 156.include "../../lang/${_GCC_DIST_NAME}/version.mk"
157_GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:tu}_DIST_VERSION} 157_GCC_DIST_VERSION:= ${${_GCC_DIST_NAME:tu}_DIST_VERSION}
158 158
159# _GCC2_PATTERNS matches N s.t. N <= 2.95.3. 159# _GCC2_PATTERNS matches N s.t. N <= 2.95.3.
160_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \ 160_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \
161 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3] 161 2.9[0-4] 2.9[0-4].* 2.95 2.95.[0-3]
162 162
163# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4. 163# _GCC3_PATTERNS matches N s.t. 2.95.3 < N < 3.4.
@@ -626,36 +626,36 @@ MAKEFLAGS+= _IGNORE_GCC=yes @@ -626,36 +626,36 @@ MAKEFLAGS+= _IGNORE_GCC=yes
626_GCC_PKGSRCDIR= ../../lang/gcc10 626_GCC_PKGSRCDIR= ../../lang/gcc10
627_GCC_DEPENDENCY= gcc10>=${_GCC_REQD}:../../lang/gcc10 627_GCC_DEPENDENCY= gcc10>=${_GCC_REQD}:../../lang/gcc10
628. if !empty(_LANGUAGES.gcc:Mc++) || \ 628. if !empty(_LANGUAGES.gcc:Mc++) || \
629 !empty(_LANGUAGES.gcc:Mfortran) || \ 629 !empty(_LANGUAGES.gcc:Mfortran) || \
630 !empty(_LANGUAGES.gcc:Mfortran77) || \ 630 !empty(_LANGUAGES.gcc:Mfortran77) || \
631 !empty(_LANGUAGES.gcc:Mgo) || \ 631 !empty(_LANGUAGES.gcc:Mgo) || \
632 !empty(_LANGUAGES.gcc:Mobjc) || \ 632 !empty(_LANGUAGES.gcc:Mobjc) || \
633 !empty(_LANGUAGES.gcc:Mobj-c++) 633 !empty(_LANGUAGES.gcc:Mobj-c++)
634_USE_GCC_SHLIB?= yes 634_USE_GCC_SHLIB?= yes
635. endif 635. endif
636. endif 636. endif
637.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS]) 637.elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
638# 638#
639# We require Ada-capable compiler in the lang/gcc5-aux directory. 639# We require Ada-capable compiler in the lang/gcc6-aux directory.
640# 640#
641_GCC_PKGBASE= gcc5-aux 641_GCC_PKGBASE= gcc6-aux
642. if ${PKGPATH} == lang/gcc5-aux 642. if ${PKGPATH} == lang/gcc6-aux
643_IGNORE_GCC= yes 643_IGNORE_GCC= yes
644MAKEFLAGS+= _IGNORE_GCC=yes 644MAKEFLAGS+= _IGNORE_GCC=yes
645. endif 645. endif
646. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc) 646. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
647_GCC_PKGSRCDIR= ../../lang/gcc5-aux 647_GCC_PKGSRCDIR= ../../lang/gcc6-aux
648_GCC_DEPENDENCY= gcc5-aux>=${_GCC_REQD}:../../lang/gcc5-aux 648_GCC_DEPENDENCY= gcc6-aux>=${_GCC_REQD}:../../lang/gcc6-aux
649. if !empty(_LANGUAGES.gcc:Mc++) || \ 649. if !empty(_LANGUAGES.gcc:Mc++) || \
650 !empty(_LANGUAGES.gcc:Mfortran) || \ 650 !empty(_LANGUAGES.gcc:Mfortran) || \
651 !empty(_LANGUAGES.gcc:Mfortran77) || \ 651 !empty(_LANGUAGES.gcc:Mfortran77) || \
652 !empty(_LANGUAGES.gcc:Mada) || \ 652 !empty(_LANGUAGES.gcc:Mada) || \
653 !empty(_LANGUAGES.gcc:Mobjc) 653 !empty(_LANGUAGES.gcc:Mobjc)
654_USE_GCC_SHLIB?= yes 654_USE_GCC_SHLIB?= yes
655. endif 655. endif
656. endif 656. endif
657.endif 657.endif
658_GCC_DEPENDS= ${_GCC_PKGBASE}>=${_GCC_REQD} 658_GCC_DEPENDS= ${_GCC_PKGBASE}>=${_GCC_REQD}
659 659
660.if !empty(_NEED_GCC3:M[yY][eE][sS]) 660.if !empty(_NEED_GCC3:M[yY][eE][sS])
661. if ${PKGPATH} == "lang/gcc3-c++" 661. if ${PKGPATH} == "lang/gcc3-c++"