CVS commit: pkgsrc/lang/gcc-aux

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep  8 09:24:04 UTC 2019

Modified Files:
        pkgsrc/lang/gcc-aux: Makefile

Log Message:
gcc-aux: amend fixincludes in the bootstrap compiler on NetBSD

Prior to GCC 9, they were exceptionally fragile, and happened to break with
NetBSD 9.x.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/gcc-aux/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc-aux/Makefile
diff -u pkgsrc/lang/gcc-aux/Makefile:1.32 pkgsrc/lang/gcc-aux/Makefile:1.33
--- pkgsrc/lang/gcc-aux/Makefile:1.32   Sun Aug 11 13:21:19 2019
+++ pkgsrc/lang/gcc-aux/Makefile        Sun Sep  8 09:24:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/08/11 13:21:19 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/09/08 09:24:04 maya Exp $
 
 PKGNAME=       gcc-aux-${SNAPSHOT}
 PKGREVISION=   4
@@ -238,6 +238,10 @@ post-extract:
        ${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