Fri Apr 2 11:48:16 2021 UTC ()
mk: Remove references to gcc48/gcc49, as done elsewhere here


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

--- pkgsrc/mk/compiler/gcc.mk 2021/02/04 21:45:13 1.220
+++ pkgsrc/mk/compiler/gcc.mk 2021/04/02 11:48:16 1.221
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.220 2021/02/04 21:45:13 gdt Exp $ 1# $NetBSD: gcc.mk,v 1.221 2021/04/02 11:48:16 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#
@@ -968,31 +968,27 @@ PREPEND_PATH+= ${_GCC_DIR}/bin @@ -968,31 +968,27 @@ PREPEND_PATH+= ${_GCC_DIR}/bin
968# Add the dependency on GCC. 968# Add the dependency on GCC.
969.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) 969.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
970. for _dir_ in ${_GCC_PKGSRCDIR} 970. for _dir_ in ${_GCC_PKGSRCDIR}
971. include "${_dir_}/buildlink3.mk" 971. include "${_dir_}/buildlink3.mk"
972. endfor 972. endfor
973.endif 973.endif
974 974
975# Add dependency on GCC libraries if requested. 975# Add dependency on GCC libraries if requested.
976.if (defined(_USE_GCC_SHLIB) && !empty(_USE_GCC_SHLIB:M[Yy][Ee][Ss])) && !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 976.if (defined(_USE_GCC_SHLIB) && !empty(_USE_GCC_SHLIB:M[Yy][Ee][Ss])) && !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
977# Special case packages which are themselves a dependency of gcc runtime. 977# Special case packages which are themselves a dependency of gcc runtime.
978. if ${PKGPATH} != devel/libtool-base && ${PKGPATH} != devel/binutils && \ 978. if ${PKGPATH} != devel/libtool-base && ${PKGPATH} != devel/binutils && \
979 empty(PKGPATH:Mlang/gcc4?) && empty(PKGPATH:Mlang/gcc[5-9]) && \ 979 empty(PKGPATH:Mlang/gcc4?) && empty(PKGPATH:Mlang/gcc[5-9]) && \
980 empty(PKGPATH:Mlang/gcc10) 980 empty(PKGPATH:Mlang/gcc10)
981. if !empty(_GCC_PKGBASE:Mgcc48) 981. if !empty(_GCC_PKGBASE:Mgcc5)
982. include "../../lang/gcc48-libs/buildlink3.mk" 
983. elif !empty(_GCC_PKGBASE:Mgcc49) 
984. include "../../lang/gcc49-libs/buildlink3.mk" 
985. elif !empty(_GCC_PKGBASE:Mgcc5) 
986. include "../../lang/gcc5-libs/buildlink3.mk" 982. include "../../lang/gcc5-libs/buildlink3.mk"
987. elif !empty(_GCC_PKGBASE:Mgcc6) 983. elif !empty(_GCC_PKGBASE:Mgcc6)
988. include "../../lang/gcc6-libs/buildlink3.mk" 984. include "../../lang/gcc6-libs/buildlink3.mk"
989. elif !empty(_GCC_PKGBASE:Mgcc7) 985. elif !empty(_GCC_PKGBASE:Mgcc7)
990. include "../../lang/gcc7-libs/buildlink3.mk" 986. include "../../lang/gcc7-libs/buildlink3.mk"
991. elif !empty(_GCC_PKGBASE:Mgcc8) 987. elif !empty(_GCC_PKGBASE:Mgcc8)
992. include "../../lang/gcc8-libs/buildlink3.mk" 988. include "../../lang/gcc8-libs/buildlink3.mk"
993. elif !empty(_GCC_PKGBASE:Mgcc9) 989. elif !empty(_GCC_PKGBASE:Mgcc9)
994. include "../../lang/gcc9-libs/buildlink3.mk" 990. include "../../lang/gcc9-libs/buildlink3.mk"
995. elif !empty(_GCC_PKGBASE:Mgcc10) 991. elif !empty(_GCC_PKGBASE:Mgcc10)
996. include "../../lang/gcc10-libs/buildlink3.mk" 992. include "../../lang/gcc10-libs/buildlink3.mk"
997. else 993. else
998PKG_FAIL_REASON+= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}" 994PKG_FAIL_REASON+= "No USE_PKGSRC_GCC_RUNTIME support for ${CC_VERSION}"