Fix build on NetBSD with PKGSRC_USE_SSP.

Thanks to mrg for hints.

Some pkglint cleanup while here.

4 files changed, 22 insertions, 8 deletions

diff --git a/lang/gcc5/DESCR b/lang/gcc5/DESCR
index 562714fdfd2..e5300642b70 100644
--- a/lang/gcc5/DESCR
+++ b/lang/gcc5/DESCR
@@ -2,5 +2,5 @@ The GNU Compiler Collection (GCC) includes front ends for C, C++, Objective-C,
 Fortran, Java, and Go, as well as libraries for these languages (libstdc++,
 libgcj,...). This package provides the snapshot release of version 5.
 
-On NetBSD a working cabsl function must be present in libm to build gfortran. 
+On NetBSD a working cabsl function must be present in libm to build gfortran.
 This has been added to -current on 2014/10/10 and to NetBSD7 on 2014/10/13.
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 57b31613046..ea85c50eb9e 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/10/14 20:17:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/17 10:19:40 wiz Exp $
 
 GCC_PKGNAME=		gcc5
 .include		"version.mk"
@@ -82,7 +82,12 @@ CONFIGURE_ARGS+=	--enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-long-long
 CONFIGURE_ARGS+=	--with-local-prefix=${GCC_PREFIX:Q}
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) && ${PKGSRC_USE_SSP:Uno} != "no"
+# on NetBSD with stack protector, use the native SSP code in libc
+CONFIGURE_ARGS+=	--disable-libssp
+.else
 CONFIGURE_ARGS+=	--enable-libssp
+.endif
 CONFIGURE_ARGS+=	--enable-threads=posix
 CONFIGURE_ARGS+=	--with-boot-ldflags=${BOOT_LDFLAGS:Q}
 .if ${OPSYS} == "NetBSD"
@@ -154,7 +159,7 @@ pre-test:
 post-test:
 	${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&		\
 	${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
-	@${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
+	${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
 
 post-install:
 	${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
diff --git a/lang/gcc5/distinfo b/lang/gcc5/distinfo
index d62f7fd110e..463f1233f33 100644
--- a/lang/gcc5/distinfo
+++ b/lang/gcc5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 22:50:35 agc Exp $
+$NetBSD: distinfo,v 1.7 2015/11/17 10:19:40 wiz Exp $
 
 SHA1 (gcc-5.2.0.tar.bz2) = fe3f5390949d47054b613edc36c557eb1d51c18e
 RMD160 (gcc-5.2.0.tar.bz2) = eaedd62e7a738f6bdc0e97a0c40fbbd75d35925b
@@ -18,7 +18,7 @@ SHA1 (patch-gcc_config_netbsd.c) = 9d1327f926dece6e753093e759b5c8b707747ae1
 SHA1 (patch-gcc_config_netbsd.h) = b722614a3822e9800a2a8f65a87e56927d05a1b1
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
-SHA1 (patch-gcc_configure) = fc96c9e150e4c28fb937cc01256d1f958fe59f30
+SHA1 (patch-gcc_configure) = bf69c2b632c45c7b870afd57e4bf004f0abc4166
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
diff --git a/lang/gcc5/patches/patch-gcc_configure b/lang/gcc5/patches/patch-gcc_configure
index 2af6aa575bf..ed7e164dcfc 100644
--- a/lang/gcc5/patches/patch-gcc_configure
+++ b/lang/gcc5/patches/patch-gcc_configure
@@ -1,8 +1,17 @@
-$NetBSD: patch-gcc_configure,v 1.1 2015/07/16 12:03:36 ryoon Exp $
+$NetBSD: patch-gcc_configure,v 1.2 2015/11/17 10:19:40 wiz Exp $
 
---- gcc/configure.orig	2014-05-21 11:08:58.000000000 +0000
+--- gcc/configure.orig	2015-07-03 17:00:49.000000000 +0000
 +++ gcc/configure
-@@ -27332,6 +27332,13 @@ case "$target" in
+@@ -27775,7 +27775,7 @@ fi
+ 	 # simply assert that glibc does provide this, which is true for all
+ 	 # realistically usable GNU/Hurd configurations.
+ 	 gcc_cv_libc_provides_ssp=yes;;
+-       *-*-darwin* | *-*-freebsd*)
++       *-*-darwin* | *-*-freebsd* | *-*-netbsd*)
+ 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"
+ if test "x$ac_cv_func___stack_chk_fail" = x""yes; then :
+   gcc_cv_libc_provides_ssp=yes
+@@ -27870,6 +27870,13 @@ case "$target" in
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;