mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 11:10:32 -04:00
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
This commit is contained in:
parent
d2d0618fc2
commit
bd64a4f18c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=382341
6 changed files with 5 additions and 2 deletions
|
@ -48,6 +48,7 @@ OPTIONS_DEFINE_i386= JAVA
|
||||||
OPTIONS_DEFINE_amd64= JAVA
|
OPTIONS_DEFINE_amd64= JAVA
|
||||||
OPTIONS_DEFAULT_i386= JAVA
|
OPTIONS_DEFAULT_i386= JAVA
|
||||||
OPTIONS_DEFAULT_amd64= JAVA
|
OPTIONS_DEFAULT_amd64= JAVA
|
||||||
|
OPTIONS_EXCLUDE_DragonFly= JAVA
|
||||||
BOOTSTRAP_DESC= Build using a full bootstrap
|
BOOTSTRAP_DESC= Build using a full bootstrap
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
|
@ -49,6 +49,7 @@ OPTIONS_DEFINE_i386= JAVA
|
||||||
OPTIONS_DEFINE_amd64= JAVA
|
OPTIONS_DEFINE_amd64= JAVA
|
||||||
OPTIONS_DEFAULT_i386= JAVA
|
OPTIONS_DEFAULT_i386= JAVA
|
||||||
OPTIONS_DEFAULT_amd64= JAVA
|
OPTIONS_DEFAULT_amd64= JAVA
|
||||||
|
OPTIONS_EXCLUDE_DragonFly= JAVA
|
||||||
BOOTSTRAP_DESC= Build using a full bootstrap
|
BOOTSTRAP_DESC= Build using a full bootstrap
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
|
@ -52,6 +52,7 @@ OPTIONS_DEFINE_amd64= JAVA
|
||||||
OPTIONS_DEFAULT= BOOTSTRAP
|
OPTIONS_DEFAULT= BOOTSTRAP
|
||||||
OPTIONS_DEFAULT_i386= JAVA
|
OPTIONS_DEFAULT_i386= JAVA
|
||||||
OPTIONS_DEFAULT_amd64= JAVA
|
OPTIONS_DEFAULT_amd64= JAVA
|
||||||
|
OPTIONS_EXCLUDE_DragonFly= JAVA
|
||||||
BOOTSTRAP_DESC= Build using a full bootstrap
|
BOOTSTRAP_DESC= Build using a full bootstrap
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
|
@ -50,6 +50,7 @@ OPTIONS_DEFINE_amd64= JAVA
|
||||||
OPTIONS_DEFAULT= BOOTSTRAP
|
OPTIONS_DEFAULT= BOOTSTRAP
|
||||||
OPTIONS_DEFAULT_i386= JAVA
|
OPTIONS_DEFAULT_i386= JAVA
|
||||||
OPTIONS_DEFAULT_amd64= JAVA
|
OPTIONS_DEFAULT_amd64= JAVA
|
||||||
|
OPTIONS_EXCLUDE_DragonFly= JAVA
|
||||||
BOOTSTRAP_DESC= Build using a full bootstrap
|
BOOTSTRAP_DESC= Build using a full bootstrap
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
|
@ -51,6 +51,7 @@ OPTIONS_DEFINE_amd64= JAVA
|
||||||
OPTIONS_DEFAULT= BOOTSTRAP
|
OPTIONS_DEFAULT= BOOTSTRAP
|
||||||
OPTIONS_DEFAULT_i386= JAVA
|
OPTIONS_DEFAULT_i386= JAVA
|
||||||
OPTIONS_DEFAULT_amd64= JAVA
|
OPTIONS_DEFAULT_amd64= JAVA
|
||||||
|
OPTIONS_EXCLUDE_DragonFly= JAVA
|
||||||
BOOTSTRAP_DESC= Build using a full bootstrap
|
BOOTSTRAP_DESC= Build using a full bootstrap
|
||||||
|
|
||||||
.include <bsd.port.pre.mk>
|
.include <bsd.port.pre.mk>
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
OPTIONS_EXCLUDE= JAVA
|
|
||||||
|
|
||||||
# The following modification to CXXFLAGS is needed in the case of DragonFly
|
# 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
|
# 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
|
# libraries were built by the gcc47 base compiler. The sys.mk file
|
||||||
|
|
Loading…
Add table
Reference in a new issue