Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1565039799217400"
MIME-Version: 1.0
Date: Mon, 5 Aug 2019 21:16:39 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/lang
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20190805211639.F20C7FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1565039799217400
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Mon Aug  5 21:16:39 UTC 2019

Modified Files:
	pkgsrc/lang/gcc5-aux: Makefile
	pkgsrc/lang/gcc6-aux: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc5-aux/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc6-aux/Makefile

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


--_----------=_1565039799217400
Content-Disposition: inline
Content-Length: 1948
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/gcc5-aux/Makefile
diff -u pkgsrc/lang/gcc5-aux/Makefile:1.10 pkgsrc/lang/gcc5-aux/Makefile:1.11
--- pkgsrc/lang/gcc5-aux/Makefile:1.10	Mon Apr  2 09:30:06 2018
+++ pkgsrc/lang/gcc5-aux/Makefile	Mon Aug  5 21:16:39 2019
@@ -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 @@ 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

Index: pkgsrc/lang/gcc6-aux/Makefile
diff -u pkgsrc/lang/gcc6-aux/Makefile:1.3 pkgsrc/lang/gcc6-aux/Makefile:1.4
--- pkgsrc/lang/gcc6-aux/Makefile:1.3	Mon Oct  1 12:32:15 2018
+++ pkgsrc/lang/gcc6-aux/Makefile	Mon Aug  5 21:16:39 2019
@@ -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 @@ 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_)|defined(__NetBSD__)|' {} \;
 .endif
 .if defined(STATIC_BUILD) || !empty(PKG_OPTIONS:Mbootstrap)
 .  if ${OPSYS} != SunOS


--_----------=_1565039799217400--