gcc47: don't use PCH for libstdc++ on gcc5, it causes hangs during configure.

limited to gcc5 because others do not seem to run into the same issues, to
avoid a regression for them.

disable libssp on netbsd - it conflicts with native libssp
(related: PR pkg/47213)

Use a more sane specfile for netbsd, linking against libc when building
shared.

bump gcc47 PKGREVISION
bump gcc47-libs PKGREVISION further than gcc47

4 files changed, 42 insertions, 5 deletions

diff --git a/lang/gcc47-libs/Makefile b/lang/gcc47-libs/Makefile
index 745ecdc891d..e3ac9e4008b 100644
--- a/lang/gcc47-libs/Makefile
+++ b/lang/gcc47-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/01/21 11:56:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2016/09/06 12:00:33 maya Exp $
 
 GCC_PKGNAME=	gcc47
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC47_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc47 package so that with the dependence pattern
 ## '{gcc47,gcc47-libs}>=4.7.*' pkg_all will choose gcc47-libs over gcc47.
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index cc1e6c9e4e2..28e52834952 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/07/09 06:38:24 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2016/09/06 12:00:33 maya Exp $
 
 GCC_PKGNAME=		gcc47
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC47_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc47-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -68,6 +68,20 @@ CHECK_SHLIBS_SKIP+=	${GCC_PKGNAME}/lib*/libgcj_bc.so*
 ## For target librarys and libjava programs.
 CONFIGURE_ENV+=		LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
 
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc-5.*)
+# hangs "checking for compiler with PCH support"
+# similar to GCC bug 54719/54645.
+CONFIGURE_ARGS+=	--disable-libstdcxx-pch
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
+# on NetBSD, use the native SSP code in libc
+CONFIGURE_ARGS+=        --disable-libssp
+.else
+CONFIGURE_ARGS+=        --enable-libssp
+.endif
+
 CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-long-long
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 47000f41197..5a8baad8aee 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2016/09/06 06:45:32 maya Exp $
+$NetBSD: distinfo,v 1.27 2016/09/06 12:00:33 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -16,6 +16,7 @@ SHA1 (patch-gcc_config_dragonfly.h) = 82f549cdc7543b4bf413a44d481ef42b10f59c82
 SHA1 (patch-gcc_config_dragonfly.opt) = 92f615c73c2e94664bae5b5935ab8b09bca15f73
 SHA1 (patch-gcc_config_i386_dragonfly.h) = 0d3f785434c02beb9c4561fe59842a970e8f7896
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
+SHA1 (patch-gcc_config_netbsd.h) = 086b593cf9f05e654df9e1a527485ca727ec44cc
 SHA1 (patch-gcc_config_sol2.h) = 4f6ffe871840dcf7e2e469fdcc5d327b9b00f957
 SHA1 (patch-gcc_configure) = a4b670d0c54c410d38715b7a2a572a7048e3ec5e
 SHA1 (patch-gcc_cp_cfns.gperf) = 8f218068e231d97e1b8936aff898c1047440b0ff
diff --git a/lang/gcc47/patches/patch-gcc_config_netbsd.h b/lang/gcc47/patches/patch-gcc_config_netbsd.h
new file mode 100644
index 00000000000..09345b08f04
--- /dev/null
+++ b/lang/gcc47/patches/patch-gcc_config_netbsd.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2016/09/06 12:00:33 maya Exp $
+
+when using shared, link against libc.
+
+--- gcc/config/netbsd.h.orig	2013-01-10 20:38:27.000000000 +0000
++++ gcc/config/netbsd.h
+@@ -96,6 +96,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}		\
+      %{p:-lposix_p}		\
+      %{pg:-lposix_p}}		\
++   %{shared:-lc}		\
+    %{!shared:			\
+      %{!symbolic:		\
+        %{!p:			\
+@@ -109,6 +110,7 @@ along with GCC; see the file COPYING3.  
+        %{!pg:-lposix}}		\
+      %{p:-lposix_p}		\
+      %{pg:-lposix_p}}		\
++   %{shared:-lc}		\
+    %{!shared:			\
+      %{!symbolic:		\
+        %{!p:			\