CVS commit: pkgsrc/mk/compiler

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr  7 07:08:34 UTC 2022

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

Log Message:
gcc.mk: gcc8 and gcc9 from pkgsrc do not build on 32-bit netbsd arm

workaround PR pkg/56679


To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 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.237 pkgsrc/mk/compiler/gcc.mk:1.238
--- pkgsrc/mk/compiler/gcc.mk:1.237     Mon Apr  4 11:23:06 2022
+++ pkgsrc/mk/compiler/gcc.mk   Thu Apr  7 07:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.237 2022/04/04 11:23:06 riastradh Exp $
+# $NetBSD: gcc.mk,v 1.238 2022/04/07 07:08:34 nia Exp $
 #
 # This is the compiler definition for the GNU Compiler Collection.
 #
@@ -316,6 +316,17 @@ _NEED_NEWER_GCC=NO
 _NEED_GCC8=    yes
 .endif
 
+# April 2022: GCC below 10 from pkgsrc is broken on 32-bit arm NetBSD.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earm*) && \
+    ${OPSYS_VERSION} < 099900 && \ 
+    (${_NEED_GCC8:tl} == "yes" || ${_NEED_GCC9:tl} == "yes")
+_NEED_GCC6=    no
+_NEED_GCC7=    no
+_NEED_GCC8=    no
+_NEED_GCC9=    no
+_NEED_GCC10=   yes
+.endif
+
 # Assume by default that GCC will only provide a C compiler.
 LANGUAGES.gcc?=        c
 .if !empty(_NEED_GCC6:M[yY][eE][sS])