CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr  2 17:04:17 UTC 2021

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

Log Message:
mk: Remove gcc44 bits


To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 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.222 pkgsrc/mk/compiler/gcc.mk:1.223
--- pkgsrc/mk/compiler/gcc.mk:1.222     Fri Apr  2 16:54:48 2021
+++ pkgsrc/mk/compiler/gcc.mk   Fri Apr  2 17:04:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.222 2021/04/02 16:54:48 nia Exp $
+# $NetBSD: gcc.mk,v 1.223 2021/04/02 17:04:17 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -94,7 +94,7 @@ _DEF_VARS.gcc=        \
        _IS_BUILTIN_GCC \
        _LANGUAGES.gcc \
        _LINKER_RPATH_FLAG \
-       _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 _NEED_GCC44 \
+       _NEED_GCC2 _NEED_GCC3 _NEED_GCC34 \
        _NEED_GCC6 _NEED_GCC7 _NEED_GCC8 _NEED_GCC9 \
        _NEED_GCC10 \
        _NEED_GCC_AUX _NEED_NEWER_GCC \
@@ -126,7 +126,7 @@ _USE_VARS.gcc=      \
        _PKGSRC_USE_FORTIFY _PKGSRC_USE_RELRO _PKGSRC_USE_STACK_CHECK \
        _OPSYS_INCLUDE_DIRS _OPSYS_LIB_DIRS
 _IGN_VARS.gcc= \
-       _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS _GCC44_PATTERNS \
+       _GCC2_PATTERNS _GCC3_PATTERNS _GCC34_PATTERNS \
        _GCC6_PATTERNS _GCC7_PATTERNS _GCC8_PATTERNS _GCC9_PATTERNS \
        _GCC10_PATTERNS _GCC_AUX_PATTERNS
 _LISTED_VARS.gcc= \
@@ -167,11 +167,8 @@ _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.0 <= N < 4.5.
-_GCC44_PATTERNS= 4.[0-4] 4.[0-4].*
-
 # _GCC6_PATTERNS matches N s.t. 4.5 <= N < 7.
-_GCC6_PATTERNS= 4.[5-9] 4.[5-9]* 5 5.* 6 6.*
+_GCC6_PATTERNS= 4.[0-9] 4.[0-9]* 5 5.* 6 6.*
 
 # _GCC7_PATTERNS matches N s.t. 7.0 <= N < 8.
 _GCC7_PATTERNS= 7 7.*
@@ -306,12 +303,6 @@ _NEED_GCC34?=      no
 _NEED_GCC34=   yes
 .  endif
 .endfor
-_NEED_GCC44?=  no
-.for _pattern_ in ${_GCC44_PATTERNS}
-.  if !empty(_GCC_REQD:M${_pattern_})
-_NEED_GCC44=   yes
-.  endif
-.endfor
 _NEED_GCC6?=   no
 .for _pattern_ in ${_GCC6_PATTERNS}
 .  if !empty(_GCC_REQD:M${_pattern_})
@@ -350,7 +341,7 @@ _NEED_NEWER_GCC=NO
 .  endif
 .endfor
 .if !empty(_NEED_GCC2:M[nN][oO]) && !empty(_NEED_GCC3:M[nN][oO]) && \
-    !empty(_NEED_GCC34:M[nN][oO]) && !empty(_NEED_GCC44:M[nN][oO]) && \
+    !empty(_NEED_GCC34:M[nN][oO]) && \
     !empty(_NEED_GCC6:M[nN][oO]) && !empty(_NEED_GCC7:M[nN][oO]) && \
     !empty(_NEED_GCC8:M[nN][oO]) && !empty(_NEED_GCC9:M[nN][oO]) && \
     !empty(_NEED_GCC10:M[nN][oO]) && \
@@ -366,8 +357,6 @@ LANGUAGES.gcc=      c c++ fortran77 objc
 LANGUAGES.gcc= c c++ fortran77 java objc
 .elif !empty(_NEED_GCC34:M[yY][eE][sS])
 LANGUAGES.gcc= c c++ fortran77 objc
-.elif !empty(_NEED_GCC44:M[yY][eE][sS])
-LANGUAGES.gcc= c c++ fortran fortran77 java objc
 .elif !empty(_NEED_GCC6:M[yY][eE][sS])
 LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
 .elif !empty(_NEED_GCC7:M[yY][eE][sS])
@@ -510,25 +499,6 @@ _GCC_DEPENDENCY=   gcc34>=${_GCC_REQD}:../
 _USE_GCC_SHLIB?=       yes
 .    endif
 .  endif
-.elif !empty(_NEED_GCC44:M[yY][eE][sS])
-#
-# We require gcc-4.4.x in the lang/gcc44 directory.
-#
-_GCC_PKGBASE=          gcc44
-.  if ${PKGPATH} == lang/gcc44
-_IGNORE_GCC=           yes
-MAKEFLAGS+=            _IGNORE_GCC=yes
-.  endif
-.  if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc)
-_GCC_PKGSRCDIR=                ../../lang/gcc44
-_GCC_DEPENDENCY=       gcc44>=${_GCC_REQD}:../../lang/gcc44
-.    if !empty(_LANGUAGES.gcc:Mc++) || \
-        !empty(_LANGUAGES.gcc:Mfortran) || \
-        !empty(_LANGUAGES.gcc:Mfortran77) || \
-        !empty(_LANGUAGES.gcc:Mobjc)
-_USE_GCC_SHLIB?=       yes
-.    endif
-.  endif
 .elif !empty(_NEED_GCC6:M[yY][eE][sS])
 #
 # We require gcc-6.x in the lang/gcc6-* directory.