Thu Apr 7 12:12:02 2022 UTC ()
Make pkglint happy


(adam)
diff -r1.238 -r1.239 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.238 -r1.239 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2022/04/07 07:08:34 1.238
+++ pkgsrc/mk/compiler/gcc.mk 2022/04/07 12:12:02 1.239
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.238 2022/04/07 07:08:34 nia Exp $ 1# $NetBSD: gcc.mk,v 1.239 2022/04/07 12:12:02 adam 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#
@@ -308,27 +308,27 @@ _NEED_GCC_AUX?= no @@ -308,27 +308,27 @@ _NEED_GCC_AUX?= no
308_NEED_GCC_AUX= yes 308_NEED_GCC_AUX= yes
309_NEED_NEWER_GCC=NO 309_NEED_NEWER_GCC=NO
310. endif 310. endif
311.endfor 311.endfor
312.if !empty(_NEED_GCC6:M[nN][oO]) && !empty(_NEED_GCC7:M[nN][oO]) && \ 312.if !empty(_NEED_GCC6:M[nN][oO]) && !empty(_NEED_GCC7:M[nN][oO]) && \
313 !empty(_NEED_GCC8:M[nN][oO]) && !empty(_NEED_GCC9:M[nN][oO]) && \ 313 !empty(_NEED_GCC8:M[nN][oO]) && !empty(_NEED_GCC9:M[nN][oO]) && \
314 !empty(_NEED_GCC10:M[nN][oO]) && \ 314 !empty(_NEED_GCC10:M[nN][oO]) && \
315 !empty(_NEED_GCC_AUX:M[nN][oO]) 315 !empty(_NEED_GCC_AUX:M[nN][oO])
316_NEED_GCC8= yes 316_NEED_GCC8= yes
317.endif 317.endif
318 318
319# April 2022: GCC below 10 from pkgsrc is broken on 32-bit arm NetBSD. 319# April 2022: GCC below 10 from pkgsrc is broken on 32-bit arm NetBSD.
320.if !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) && \ 320.if !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) && \
321 ${OPSYS_VERSION} < 099900 && \  321 ${OPSYS_VERSION} < 099900 && \
322 (${_NEED_GCC8:tl} == "yes" || ${_NEED_GCC9:tl} == "yes") 322 (${_NEED_GCC8:tl} == "yes" || ${_NEED_GCC9:tl} == "yes")
323_NEED_GCC6= no 323_NEED_GCC6= no
324_NEED_GCC7= no 324_NEED_GCC7= no
325_NEED_GCC8= no 325_NEED_GCC8= no
326_NEED_GCC9= no 326_NEED_GCC9= no
327_NEED_GCC10= yes 327_NEED_GCC10= yes
328.endif 328.endif
329 329
330# Assume by default that GCC will only provide a C compiler. 330# Assume by default that GCC will only provide a C compiler.
331LANGUAGES.gcc?= c 331LANGUAGES.gcc?= c
332.if !empty(_NEED_GCC6:M[yY][eE][sS]) 332.if !empty(_NEED_GCC6:M[yY][eE][sS])
333LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++ 333LANGUAGES.gcc= c c++ fortran fortran77 go java objc obj-c++
334.elif !empty(_NEED_GCC7:M[yY][eE][sS]) 334.elif !empty(_NEED_GCC7:M[yY][eE][sS])