CVS commit: pkgsrc/lang/gcc-aux

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jul 10 00:21:31 UTC 2017

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

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

the configure test 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.27 -r1.28 pkgsrc/lang/gcc-aux/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc-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/gcc-aux/Makefile
diff -u pkgsrc/lang/gcc-aux/Makefile:1.27 pkgsrc/lang/gcc-aux/Makefile:1.28
--- pkgsrc/lang/gcc-aux/Makefile:1.27   Thu Jan 19 18:52:13 2017
+++ pkgsrc/lang/gcc-aux/Makefile        Mon Jul 10 00:21:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/01/19 18:52:13 agc Exp $
+# $NetBSD: Makefile,v 1.28 2017/07/10 00:21:31 maya Exp $
 #
 
 PKGNAME=       gcc-aux-${SNAPSHOT}
@@ -187,7 +187,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
@@ -195,6 +195,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/gcc-aux/options.mk
diff -u pkgsrc/lang/gcc-aux/options.mk:1.5 pkgsrc/lang/gcc-aux/options.mk:1.6
--- pkgsrc/lang/gcc-aux/options.mk:1.5  Sun Jun 14 19:46:51 2015
+++ pkgsrc/lang/gcc-aux/options.mk      Mon Jul 10 00:21:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2015/06/14 19:46:51 marino Exp $
+# $NetBSD: options.mk,v 1.6 2017/07/10 00:21:31 maya Exp $
 
 # NLS is failing, might be linking with wrong iconv lib.
 # Disable option until further notice
@@ -114,7 +114,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