CVS commit: pkgsrc/lang/gcc5-aux

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Jul  9 23:17:39 UTC 2017

Modified Files:
        pkgsrc/lang/gcc5-aux: Makefile options.mk

Log Message:
Always stop libstdc++ from using PCH, not just on bootstrap.

It fails and hangs on netbsd, and people who have looked at the PCH
implementation blame it rather than the OS.

whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc5-aux/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc5-aux/options.mk

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

Modified files:

Index: pkgsrc/lang/gcc5-aux/Makefile
diff -u pkgsrc/lang/gcc5-aux/Makefile:1.8 pkgsrc/lang/gcc5-aux/Makefile:1.9
--- pkgsrc/lang/gcc5-aux/Makefile:1.8   Wed Jun  7 23:19:05 2017
+++ pkgsrc/lang/gcc5-aux/Makefile       Sun Jul  9 23:17:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/06/07 23:19:05 khorben Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/09 23:17:39 maya Exp $
 #
 
 PKGNAME=       gcc5-aux-${SNAPSHOT}
@@ -186,7 +186,7 @@ MY_MAKE_ENV+=               lt_cv_path_SED=${TOOLS_SE
 
 
 # The standard configuration options
-CONFIGURE_ARGS=        --enable-languages=${LANGS:Q}
+CONFIGURE_ARGS=                --enable-languages=${LANGS:Q}
 CONFIGURE_ARGS+=       --build=${BLD_TARGET}
 CONFIGURE_ARGS+=       --prefix=${PKG_PREFIX:Q}
 CONFIGURE_ARGS+=       --enable-threads=posix
@@ -194,6 +194,7 @@ CONFIGURE_ARGS+=    --enable-checking=relea
 CONFIGURE_ARGS+=       --disable-libmudflap
 CONFIGURE_ARGS+=       --disable-libgomp
 CONFIGURE_ARGS+=       --disable-libssp
+CONFIGURE_ARGS+=       --disable-libstdcxx-pch
 CONFIGURE_ARGS+=       --disable-libcilkrts
 CONFIGURE_ARGS+=       --disable-libitm
 CONFIGURE_ARGS+=       ${EXTRA_CONFARGS}

Index: pkgsrc/lang/gcc5-aux/options.mk
diff -u pkgsrc/lang/gcc5-aux/options.mk:1.4 pkgsrc/lang/gcc5-aux/options.mk:1.5
--- pkgsrc/lang/gcc5-aux/options.mk:1.4 Sat Nov 26 16:12:18 2016
+++ pkgsrc/lang/gcc5-aux/options.mk     Sun Jul  9 23:17:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2016/11/26 16:12:18 marino Exp $
+# $NetBSD: options.mk,v 1.5 2017/07/09 23:17:39 maya Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc5-aux
 PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap allstages
@@ -103,7 +103,6 @@ EXTRA_CONFARGS+= --with-mpc=${BUILDLINK_
 
 .if !empty(PKG_OPTIONS:Mbootstrap)
 EXTRA_CONFARGS+= --disable-shared --disable-lto
-EXTRA_CONFARGS+= --disable-libstdcxx-pch
 .  if ${OPSYS} != SunOS
 EXTRA_CONFARGS+= --with-stage1-ldflags=-static
 EXTRA_CONFARGS+= --with-boot-ldflags=-static