From 8b776ac68f9af4596be3824152bcf0bc6b67fa1d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 31 Dec 2015 17:26:34 +0800 Subject: classpath: fix invalid options After updated to version 0.99, the following options became invalid: * --with-ecj: use JAVAC env variable instead * --with-fastjar: change to --with-jar * --with-vm: uae JAVA env variable instead * --disable-qt4-peer: invalid even in 0.93, just drop it. Signed-off-by: Jackie Huang Signed-off-by: Otavio Salvador --- recipes-core/classpath/classpath.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 1bdfd78..2be849b 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc @@ -28,24 +28,21 @@ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" S = "${WORKDIR}/${PBN}-${PV}" export JAVA = "java" +export JAVAC = "javac" EXTRA_OECONF = "\ --with-glibj \ - --with-ecj=javac \ - --with-fastjar=fastjar \ + --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \ --includedir=${includedir}/classpath \ - --with-vm=java \ --disable-Werror \ --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \ --with-gmp=${STAGING_LIBDIR}/.. \ --disable-alsa \ --disable-dssi \ - --disable-qt4-peer \ --disable-plugin \ --enable-gconf-peer \ --enable-gtk-peer \ --enable-local-sockets \ - --with-vm=java \ " -- cgit v1.2.3-54-g00ecf