From 5561f84aa6aacc11743927da15043a9a8323b6a6 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 4 Jan 2018 14:19:05 +0100 Subject: meta: drop deprecated virtclass-native Replaces them with class-native. Signed-off-by: Ming Liu Signed-off-by: Otavio Salvador --- recipes-core/jamvm/jamvm.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes-core/jamvm/jamvm.inc') diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index cad91a2..da1ca29 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -4,14 +4,14 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" -DEPENDS_virtclass-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" +DEPENDS_class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" RDEPENDS_${PN} = "classpath" -RDEPENDS_${PN}_virtclass-native = "" +RDEPENDS_${PN}_class-native = "" -PROVIDES_virtclass-native = "virtual/java-native" +PROVIDES_class-native = "virtual/java-native" RPROVIDES_${PN} = "java2-runtime" -RPROVIDES_${PN}_virtclass-native = "" +RPROVIDES_${PN}_class-native = "" BBCLASSEXTEND = "native" @@ -21,7 +21,7 @@ inherit java autotools update-alternatives pkgconfig relative_symlinks # This uses 32 bit arm, so force the instruction set to arm, not thumb ARM_INSTRUCTION_SET = "arm" -do_configure_append_virtclass-native() { +do_configure_append_class-native() { sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ ${WORKDIR}/java @@ -31,14 +31,14 @@ do_configure_append_virtclass-native() { EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" # Needed for big compilation targets like OpenJDK -CFLAGS_append_virtclass-native = " -DDEFAULT_MAX_HEAP=1024*MB" +CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB" # Enforce usage of ecj-initial. EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ " -do_install_append_virtclass-native() { +do_install_append_class-native() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/java ${D}${bindir}/java -- cgit v1.2.3-54-g00ecf