[pkgsrc/trunk]: pkgsrc/lang gcc{5, 6, 7}: Disable fixincludes on SmartOS like g...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22cb82f04c0a
branches:  trunk
changeset: 372644:22cb82f04c0a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Dec 13 10:54:53 2017 +0000

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

diffstat:

 lang/gcc49/Makefile |   4 ++--
 lang/gcc5/Makefile  |  11 ++++++++++-
 lang/gcc6/Makefile  |  11 ++++++++++-
 lang/gcc7/Makefile  |  11 ++++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diffs (93 lines):

diff -r 99a3c60b00ce -r 22cb82f04c0a lang/gcc49/Makefile
--- a/lang/gcc49/Makefile       Wed Dec 13 09:34:48 2017 +0000
+++ b/lang/gcc49/Makefile       Wed Dec 13 10:54:53 2017 +0000
@@ -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 @@
 .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
diff -r 99a3c60b00ce -r 22cb82f04c0a lang/gcc5/Makefile
--- a/lang/gcc5/Makefile        Wed Dec 13 09:34:48 2017 +0000
+++ b/lang/gcc5/Makefile        Wed Dec 13 10:54:53 2017 +0000
@@ -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 @@
 # 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.
diff -r 99a3c60b00ce -r 22cb82f04c0a lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Wed Dec 13 09:34:48 2017 +0000
+++ b/lang/gcc6/Makefile        Wed Dec 13 10:54:53 2017 +0000
@@ -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 @@
 # 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.
diff -r 99a3c60b00ce -r 22cb82f04c0a lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Wed Dec 13 09:34:48 2017 +0000
+++ b/lang/gcc7/Makefile        Wed Dec 13 10:54:53 2017 +0000
@@ -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 @@
 # 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.