From 0cc63821c1417c4c77ebdc6a1f48d67f2cc0620f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
<lucio@lucioillanes.de>
Date: Fri, 16 Nov 2018 21:27:24 +0000
Subject: vars/build.vars:{jamvm,classpath}:${PKG_DISABLED}: only if javac
exists (via Redfoxmoon.)
---
vars/build.vars | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'vars')
diff --git a/vars/build.vars b/vars/build.vars
index 45738bc7..fb5c1136 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1198,7 +1198,7 @@ xeyes xorriso xterm xwd";
: ${PKG_JAMVM_URL:=http://sourceforge.mirrorservice.org/j/ja/jamvm/jamvm/JamVM%20${PKG_JAMVM_VERSION}/jamvm-${PKG_JAMVM_VERSION}.tar.gz};
: ${PKG_JAMVM_CONFIGURE_ARGS_EXTRA:="--enable-trace --with-classpath-install-dir= --enable-ffi"};
: ${PKG_JAMVM_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/lib/libffi-3.2.1/include};
-if ! which ecj gcj javac >/dev/null 2>&1; then
+if ! which javac >/dev/null 2>&1; then
: ${PKG_JAMVM_DISABLED:=1};
fi;
: ${PKG_JAMVM_IN_TREE:=1};
@@ -1206,7 +1206,7 @@ fi;
: ${PKG_CLASSPATH_VERSION:=0.99};
: ${PKG_CLASSPATH_URL:=ftp://ftp.gnu.org/gnu/classpath/classpath-${PKG_CLASSPATH_VERSION}.tar.gz};
: ${PKG_CLASSPATH_CONFIGURE_ARGS_EXTRA:="--disable-plugin --disable-alsa --disable-gtk-peer --disable-gconf-peer --with-gmp=${PREFIX_NATIVE} --with-gmp-include=${PREFIX_NATIVE}/include --with-gmp-lib=${PREFIX_NATIVE}/lib"};
-if ! which ecj gcj javac >/dev/null 2>&1; then
+if ! which javac >/dev/null 2>&1; then
: ${PKG_CLASSPATH_DISABLED:=1};
fi;
: ${PKG_CLASSPATH_ENV_VARS_EXTRA:="GMP_CFLAGS=-I${PREFIX_NATIVE}/include"};
--
cgit v1.2.3