CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Dec 13 10:54:53 UTC 2017

Modified Files:
        pkgsrc/lang/gcc49: Makefile
        pkgsrc/lang/gcc5: Makefile
        pkgsrc/lang/gcc6: Makefile
        pkgsrc/lang/gcc7: Makefile

Log Message:
gcc{5,6,7}: Disable fixincludes on SmartOS like gcc49.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/gcc49/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/gcc5/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gcc7/Makefile

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

Modified files:

Index: pkgsrc/lang/gcc49/Makefile
diff -u pkgsrc/lang/gcc49/Makefile:1.23 pkgsrc/lang/gcc49/Makefile:1.24
--- pkgsrc/lang/gcc49/Makefile:1.23     Mon Nov 13 19:36:26 2017
+++ pkgsrc/lang/gcc49/Makefile  Wed Dec 13 10:54:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/11/13 19:36:26 maya Exp $
+# $NetBSD: Makefile,v 1.24 2017/12/13 10:54:53 jperkin Exp $
 
 GCC_PKGNAME=   gcc49
 .include       "version.mk"
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+=    --with-arch=i486 --with
 .endif
 
 # Disable fixincludes on SmartOS, header changes result in broken includes
-# being generated, see https://github.com/joyent/pkgsrc/issues/270
+# being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
 .if ${OS_VARIANT} == "SmartOS"
 SUBST_CLASSES+=                fixinc
 SUBST_STAGE.fixinc=    pre-configure

Index: pkgsrc/lang/gcc5/Makefile
diff -u pkgsrc/lang/gcc5/Makefile:1.25 pkgsrc/lang/gcc5/Makefile:1.26
--- pkgsrc/lang/gcc5/Makefile:1.25      Mon Nov 13 19:36:26 2017
+++ pkgsrc/lang/gcc5/Makefile   Wed Dec 13 10:54:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/11/13 19:36:26 maya Exp $
+# $NetBSD: Makefile,v 1.26 2017/12/13 10:54:53 jperkin Exp $
 
 GCC_PKGNAME=           gcc5
 .include               "version.mk"
@@ -65,6 +65,15 @@ BOOT_LDFLAGS+=               ${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=  rm:-stdlib=libc++
 
+# Disable fixincludes on SmartOS, header changes result in broken includes
+# being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
+.if ${OS_VARIANT} == "SmartOS"
+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.

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.11 pkgsrc/lang/gcc6/Makefile:1.12
--- pkgsrc/lang/gcc6/Makefile:1.11      Mon Nov 13 19:36:26 2017
+++ pkgsrc/lang/gcc6/Makefile   Wed Dec 13 10:54:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/11/13 19:36:26 maya Exp $
+# $NetBSD: Makefile,v 1.12 2017/12/13 10:54:53 jperkin Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -66,6 +66,15 @@ BOOT_LDFLAGS+=               ${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=  rm:-stdlib=libc++
 
+# Disable fixincludes on SmartOS, header changes result in broken includes
+# being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
+.if ${OS_VARIANT} == "SmartOS"
+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.

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.14 pkgsrc/lang/gcc7/Makefile:1.15
--- pkgsrc/lang/gcc7/Makefile:1.14      Mon Nov 13 19:36:26 2017
+++ pkgsrc/lang/gcc7/Makefile   Wed Dec 13 10:54:53 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/11/13 19:36:26 maya Exp $
+# $NetBSD: Makefile,v 1.15 2017/12/13 10:54:53 jperkin Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -66,6 +66,15 @@ BOOT_LDFLAGS+=               ${LDFLAGS:M-Wl,-syslibro
 # GCC does not understand this option; remove it, or stage build will fail
 BUILDLINK_TRANSFORM+=  rm:-stdlib=libc++
 
+# Disable fixincludes on SmartOS, header changes result in broken includes
+# being generated, see https://github.com/joyent/pkgsrc-legacy/issues/270
+.if ${OS_VARIANT} == "SmartOS"
+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.