[pkgsrc/trunk]: pkgsrc/lang gcc5-aux, gcc6-aux: patch fixincludes on netbsd.

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf2891d7a8c3
branches:  trunk
changeset: 399282:cf2891d7a8c3
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Aug 05 21:16:39 2019 +0000

description:
gcc5-aux, gcc6-aux: patch fixincludes on netbsd.

This is based on an already upstreamed patched that exists in GCC>9.0.
GCC stddef.h relied on the include guards of headers, and those were
changed in netbsd 9.0, so these packages no longer build.

Since we are using a bootstrap GCC, we also need to patch the headers
in the bootstrap fixincludes, patching the package is not sufficient.

Ada part of PR toolchain/54362.

diffstat:

 lang/gcc5-aux/Makefile |  6 +++++-
 lang/gcc6-aux/Makefile |  6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r d8a5587e340a -r cf2891d7a8c3 lang/gcc5-aux/Makefile
--- a/lang/gcc5-aux/Makefile    Mon Aug 05 20:51:03 2019 +0000
+++ b/lang/gcc5-aux/Makefile    Mon Aug 05 21:16:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/02 09:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/08/05 21:16:39 maya Exp $
 
 PKGNAME=       gcc5-aux-${SNAPSHOT}
 PKGREVISION=   ${MAIN_PR}
@@ -225,6 +225,10 @@
        ${PERL5} -pi -e 's|new Long_Integer|new Integer|' \
                ${WRKSRC}/gcc/ada/s-osprim-posix.adb
 .  endif
+       # GCC < 9's fixincludes is broken for NetBSD >= 9.0 (PR pkg/54362)
+       # This affects the bootstrap GCC used, too.
+       # Fixed in https://github.com/gcc-mirror/gcc/commit/c7af124dca795b835d7fda24192b9e4849f1bb08
+       ${FIND} ${WRKDIR} -name stddef.h -exec ${SED} -i -e 's|defined(_ANSI_H_)|1|' {} \;
 .endif
 .if defined(STATIC_BUILD) || !empty(PKG_OPTIONS:Mbootstrap)
 .  if ${OPSYS} != SunOS
diff -r d8a5587e340a -r cf2891d7a8c3 lang/gcc6-aux/Makefile
--- a/lang/gcc6-aux/Makefile    Mon Aug 05 20:51:03 2019 +0000
+++ b/lang/gcc6-aux/Makefile    Mon Aug 05 21:16:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/10/01 12:32:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/05 21:16:39 maya Exp $
 
 PKGNAME=       gcc6-aux-${SNAPSHOT}
 PKGREVISION=   ${MAIN_PR}
@@ -219,6 +219,10 @@
        ${PERL5} -pi -e 's|new Long_Integer|new Integer|' \
                ${WRKSRC}/gcc/ada/s-osprim-posix.adb
 .  endif
+       # GCC < 9's fixincludes is broken for NetBSD >= 9.0 (PR pkg/54362)
+       # This affects the bootstrap GCC used, too.
+       # Fixed in https://github.com/gcc-mirror/gcc/commit/c7af124dca795b835d7fda24192b9e4849f1bb08
+       ${FIND} ${WRKDIR} -name stddef.h -exec ${SED} -i -e 's|defined(_ANSI_H_)|defined(__NetBSD__)|' {} \;
 .endif
 .if defined(STATIC_BUILD) || !empty(PKG_OPTIONS:Mbootstrap)
 .  if ${OPSYS} != SunOS