Date: Thu, 26 Mar 2015 20:36:04 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382341 - in head/lang: gcc46 gcc47 gcc48 gcc49 gcc5 Message-ID: <201503262036.t2QKa4Aw076378@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Mar 26 20:36:04 2015 New Revision: 382341 URL: https://svnweb.freebsd.org/changeset/ports/382341 QAT: https://qat.redports.org/buildarchive/r382341/ Log: lang/gcc(46,47,48,49,5): Use OPTIONS_EXCLUDE_DragonFly to block JAVA The JAVA frontend doesn't build on DragonFly on any release. The new OPTIONS_EXCLUDE_${OPSYS} feature is a nice way to avoid the use of Makefile.DragonFly (most are in dports, but one is in lang/gcc5). The recent addition of CXXFLAGS to lang/gcc5 prevents Makefile.DragonFly on lang/gcc5 from being removed outright. There are a couple of options available to allow its removal, but I'll need to discuss with Gerald. Approved by: DragonFly blanket Modified: head/lang/gcc46/Makefile head/lang/gcc47/Makefile head/lang/gcc48/Makefile head/lang/gcc49/Makefile head/lang/gcc5/Makefile head/lang/gcc5/Makefile.DragonFly Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc46/Makefile Thu Mar 26 20:36:04 2015 (r382341) @@ -48,6 +48,7 @@ OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .include <bsd.port.pre.mk> Modified: head/lang/gcc47/Makefile ============================================================================== --- head/lang/gcc47/Makefile Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc47/Makefile Thu Mar 26 20:36:04 2015 (r382341) @@ -49,6 +49,7 @@ OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .include <bsd.port.pre.mk> Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc48/Makefile Thu Mar 26 20:36:04 2015 (r382341) @@ -52,6 +52,7 @@ OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT= BOOTSTRAP OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .include <bsd.port.pre.mk> Modified: head/lang/gcc49/Makefile ============================================================================== --- head/lang/gcc49/Makefile Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc49/Makefile Thu Mar 26 20:36:04 2015 (r382341) @@ -50,6 +50,7 @@ OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT= BOOTSTRAP OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .include <bsd.port.pre.mk> Modified: head/lang/gcc5/Makefile ============================================================================== --- head/lang/gcc5/Makefile Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc5/Makefile Thu Mar 26 20:36:04 2015 (r382341) @@ -51,6 +51,7 @@ OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT= BOOTSTRAP OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA +OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap .include <bsd.port.pre.mk> Modified: head/lang/gcc5/Makefile.DragonFly ============================================================================== --- head/lang/gcc5/Makefile.DragonFly Thu Mar 26 20:22:00 2015 (r382340) +++ head/lang/gcc5/Makefile.DragonFly Thu Mar 26 20:36:04 2015 (r382341) @@ -1,7 +1,5 @@ # $FreeBSD$ -OPTIONS_EXCLUDE= JAVA - # The following modification to CXXFLAGS is needed in the case of DragonFly # 4.1+ building lang/gcc5 with the gcc50 base compiler when the system # libraries were built by the gcc47 base compiler. The sys.mk file
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503262036.t2QKa4Aw076378>