Move the gcc4[12]-withgcjawt WITHOUT_JAVA BROKEN check into gcc41 since
it needs to happen after that variable is assigned in order to correctly function on !i386.
This commit is contained in:
parent
0db9558e4c
commit
2f3a81279f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=173194
3 changed files with 3 additions and 8 deletions
|
@ -16,10 +16,6 @@ DESCR= ${.CURDIR}/pkg-descr
|
||||||
|
|
||||||
WITH_JAVA_AWT= yes
|
WITH_JAVA_AWT= yes
|
||||||
|
|
||||||
.if defined (WITHOUT_JAVA)
|
|
||||||
BROKEN= "Does not build gcj"
|
|
||||||
.endif
|
|
||||||
|
|
||||||
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
|
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
|
||||||
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
|
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
|
||||||
USE_AUTOTOOLS= libtool:15
|
USE_AUTOTOOLS= libtool:15
|
||||||
|
|
|
@ -72,6 +72,9 @@ CONFIGURE_ARGS+= --disable-nls \
|
||||||
CONFIGURE_ARGS+= --with-java-home=${PREFIX}/lib/jvm/java-1.4.2-gcj${SUFFIX}-1.4.2.0/jre \
|
CONFIGURE_ARGS+= --with-java-home=${PREFIX}/lib/jvm/java-1.4.2-gcj${SUFFIX}-1.4.2.0/jre \
|
||||||
--enable-java-awt=gtk,xlib \
|
--enable-java-awt=gtk,xlib \
|
||||||
--enable-gtk-cairo
|
--enable-gtk-cairo
|
||||||
|
.if defined(WITHOUT_JAVA)
|
||||||
|
BROKEN= Does not compile gcj
|
||||||
|
.endif
|
||||||
.endif
|
.endif
|
||||||
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
|
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
|
||||||
ALL_TARGET= bootstrap-lean
|
ALL_TARGET= bootstrap-lean
|
||||||
|
|
|
@ -16,10 +16,6 @@ DESCR= ${.CURDIR}/pkg-descr
|
||||||
|
|
||||||
WITH_JAVA_AWT= yes
|
WITH_JAVA_AWT= yes
|
||||||
|
|
||||||
.if defined (WITHOUT_JAVA)
|
|
||||||
BROKEN= Does not build gcj
|
|
||||||
.endif
|
|
||||||
|
|
||||||
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
|
#weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442
|
||||||
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
|
EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure
|
||||||
USE_AUTOTOOLS= libtool:15
|
USE_AUTOTOOLS= libtool:15
|
||||||
|
|
Loading…
Reference in a new issue