diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2015-12-31 17:26:34 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-01-04 09:22:35 -0200 |
commit | 8b776ac68f9af4596be3824152bcf0bc6b67fa1d (patch) | |
tree | 7b37339c9db0919a3873d3e4a9f8071546087776 /recipes-core/classpath | |
parent | 3f634889bc81bcb928e5669631d094df79d14cae (diff) | |
download | meta-java-8b776ac68f9af4596be3824152bcf0bc6b67fa1d.tar.gz |
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 <jackie.huang@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/classpath')
-rw-r--r-- | recipes-core/classpath/classpath.inc | 7 |
1 files 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" | |||
28 | S = "${WORKDIR}/${PBN}-${PV}" | 28 | S = "${WORKDIR}/${PBN}-${PV}" |
29 | 29 | ||
30 | export JAVA = "java" | 30 | export JAVA = "java" |
31 | export JAVAC = "javac" | ||
31 | 32 | ||
32 | EXTRA_OECONF = "\ | 33 | EXTRA_OECONF = "\ |
33 | --with-glibj \ | 34 | --with-glibj \ |
34 | --with-ecj=javac \ | 35 | --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \ |
35 | --with-fastjar=fastjar \ | ||
36 | --includedir=${includedir}/classpath \ | 36 | --includedir=${includedir}/classpath \ |
37 | --with-vm=java \ | ||
38 | --disable-Werror \ | 37 | --disable-Werror \ |
39 | --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \ | 38 | --with-antlr-jar=${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar \ |
40 | --with-gmp=${STAGING_LIBDIR}/.. \ | 39 | --with-gmp=${STAGING_LIBDIR}/.. \ |
41 | --disable-alsa \ | 40 | --disable-alsa \ |
42 | --disable-dssi \ | 41 | --disable-dssi \ |
43 | --disable-qt4-peer \ | ||
44 | --disable-plugin \ | 42 | --disable-plugin \ |
45 | --enable-gconf-peer \ | 43 | --enable-gconf-peer \ |
46 | --enable-gtk-peer \ | 44 | --enable-gtk-peer \ |
47 | --enable-local-sockets \ | 45 | --enable-local-sockets \ |
48 | --with-vm=java \ | ||
49 | " | 46 | " |
50 | 47 | ||
51 | 48 | ||