CVS commit: pkgsrc/mk/compiler

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr  2 16:54:48 UTC 2021

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

Log Message:
mk: use gcc6-aux for ada


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 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.221 pkgsrc/mk/compiler/gcc.mk:1.222
--- pkgsrc/mk/compiler/gcc.mk:1.221     Fri Apr  2 11:48:16 2021
+++ pkgsrc/mk/compiler/gcc.mk   Fri Apr  2 16:54:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.221 2021/04/02 11:48:16 nia Exp $
+# $NetBSD: gcc.mk,v 1.222 2021/04/02 16:54:48 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -144,10 +144,10 @@ GCC_REQD+=        2.8.0
 GCC_REQD+=     3.0
 .endif
 
-# Only one compiler defined here supports Ada: lang/gcc5-aux
-# If the Ada language is requested, force lang/gcc5-aux to be selected
+# Only one compiler defined here supports Ada: lang/gcc6-aux
+# If the Ada language is requested, force lang/gcc6-aux to be selected
 .if !empty(USE_LANGUAGES:Mada)
-GCC_REQD+=     20120614
+GCC_REQD+=     20160822
 .endif
 
 # _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
@@ -636,16 +636,16 @@ _USE_GCC_SHLIB?=  yes
 .  endif
 .elif !empty(_NEED_GCC_AUX:M[yY][eE][sS])
 #
-# We require Ada-capable compiler in the lang/gcc5-aux directory.
+# We require Ada-capable compiler in the lang/gcc6-aux directory.
 #
-_GCC_PKGBASE=          gcc5-aux
-.  if ${PKGPATH} == lang/gcc5-aux
+_GCC_PKGBASE=          gcc6-aux
+.  if ${PKGPATH} == lang/gcc6-aux
 _IGNORE_GCC=           yes
 MAKEFLAGS+=            _IGNORE_GCC=yes
 .  endif
 .  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR=                ../../lang/gcc5-aux
-_GCC_DEPENDENCY=       gcc5-aux>=${_GCC_REQD}:../../lang/gcc5-aux
+_GCC_PKGSRCDIR=                ../../lang/gcc6-aux
+_GCC_DEPENDENCY=       gcc6-aux>=${_GCC_REQD}:../../lang/gcc6-aux
 .    if !empty(_LANGUAGES.gcc:Mc++) || \
         !empty(_LANGUAGES.gcc:Mfortran) || \
         !empty(_LANGUAGES.gcc:Mfortran77) || \