diff options
author | jperkin <jperkin@pkgsrc.org> | 2016-01-21 11:55:58 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2016-01-21 11:55:58 +0000 |
commit | 38517aa7c1f3eaefd92a7b283d46cc826b503406 (patch) | |
tree | ae24856789528d4ebf9c8e9da89895901361fcca | |
parent | ec7b1f257352b6f4bcd1e35586b969d4c3b1afe1 (diff) | |
download | pkgsrc-38517aa7c1f3eaefd92a7b283d46cc826b503406.tar.gz |
Don't use GCC fixincludes on SmartOS, header changes mean that broken includes
are generated and various features end up disabled. Bump PKGREVISION.
-rw-r--r-- | lang/gcc47/Makefile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index 02fab83f6c2..904e22db011 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2015/10/20 10:26:40 jperkin Exp $ +# $NetBSD: Makefile,v 1.35 2016/01/21 11:55:58 jperkin Exp $ GCC_PKGNAME= gcc47 .include "version.mk" @@ -8,6 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC47_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc47-libs needs to be bump to be at least 1 more than the ## PKGREVISION of this package! +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC47_DIST_VERSION}/} EXTRACT_SUFX= .tar.bz2 @@ -95,6 +96,15 @@ CONFIGURE_ARGS+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip} 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 +.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" # ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into |