Do not generate fixed include files under NetBSD. Bump PKGREVISION

Fix graphics/cairo build failure (ssp.h not found error) as outer compiler.

2 files changed, 12 insertions, 3 deletions

diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile
index a8009ba56bc..ca78043ce13 100644
--- a/lang/gcc5-libs/Makefile
+++ b/lang/gcc5-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/12/11 12:31:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2016/02/06 22:19:55 ryoon Exp $
 
 GCC_PKGNAME=	gcc5
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC5_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc5 package so that with the dependence pattern
 ## '{gcc5,gcc5-libs}>=5.1.*' pkg_add will choose gcc5-libs over gcc5.
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index e30732dbb6f..17c3846addf 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2015/12/11 12:31:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/06 22:19:55 ryoon Exp $
 
 GCC_PKGNAME=		gcc5
 .include		"version.mk"
+PKGREVISION=	1
 
 DISTNAME=	gcc-${GCC5_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC5_DIST_VERSION}
@@ -64,6 +65,14 @@ BOOT_LDFLAGS+=		${LDFLAGS:M-Wl,-syslibroot*}
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=	rm:-stdlib=libc++
 
+# Avoid ssp.h not found error.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+SUBST_CLASSES+=		fixinc
+SUBST_STAGE.fixinc=	pre-configure
+SUBST_FILES.fixinc=	gcc/Makefile.in
+SUBST_SED.fixinc=	-e "s,\./fixinc.sh,-c true,"
+.endif
+
 .include "options.mk"
 
 ## For graphite support.