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

This commit is contained in:
jperkin 2017-12-13 10:54:53 +00:00
parent 3d33d44d0d
commit c1e44a0735
4 changed files with 32 additions and 5 deletions

View file

@ -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-tune=i486
.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

View file

@ -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,-syslibroot*}
# 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.

View file

@ -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,-syslibroot*}
# 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.

View file

@ -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,-syslibroot*}
# 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.