diff options
author | Ming Liu <liu.ming50@gmail.com> | 2018-01-04 14:19:05 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-01-09 13:41:35 -0200 |
commit | 5561f84aa6aacc11743927da15043a9a8323b6a6 (patch) | |
tree | 1d39bd94c30ff2d4f15135d3da784e8747cb26a4 /recipes-core/jamvm | |
parent | cfda09395f2c5c5e21f222798e7a07e26e99367e (diff) | |
download | meta-java-5561f84aa6aacc11743927da15043a9a8323b6a6.tar.gz |
meta: drop deprecated virtclass-native
Replaces them with class-native.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core/jamvm')
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 14 |
1 files changed, 7 insertions, 7 deletions
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" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" |
5 | 5 | ||
6 | DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" | 6 | DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" |
7 | DEPENDS_virtclass-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" | 7 | DEPENDS_class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" |
8 | 8 | ||
9 | RDEPENDS_${PN} = "classpath" | 9 | RDEPENDS_${PN} = "classpath" |
10 | RDEPENDS_${PN}_virtclass-native = "" | 10 | RDEPENDS_${PN}_class-native = "" |
11 | 11 | ||
12 | PROVIDES_virtclass-native = "virtual/java-native" | 12 | PROVIDES_class-native = "virtual/java-native" |
13 | RPROVIDES_${PN} = "java2-runtime" | 13 | RPROVIDES_${PN} = "java2-runtime" |
14 | RPROVIDES_${PN}_virtclass-native = "" | 14 | RPROVIDES_${PN}_class-native = "" |
15 | 15 | ||
16 | BBCLASSEXTEND = "native" | 16 | BBCLASSEXTEND = "native" |
17 | 17 | ||
@@ -21,7 +21,7 @@ inherit java autotools update-alternatives pkgconfig relative_symlinks | |||
21 | # This uses 32 bit arm, so force the instruction set to arm, not thumb | 21 | # This uses 32 bit arm, so force the instruction set to arm, not thumb |
22 | ARM_INSTRUCTION_SET = "arm" | 22 | ARM_INSTRUCTION_SET = "arm" |
23 | 23 | ||
24 | do_configure_append_virtclass-native() { | 24 | do_configure_append_class-native() { |
25 | sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ | 25 | sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ |
26 | -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ | 26 | -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ |
27 | ${WORKDIR}/java | 27 | ${WORKDIR}/java |
@@ -31,14 +31,14 @@ do_configure_append_virtclass-native() { | |||
31 | EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" | 31 | EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi" |
32 | 32 | ||
33 | # Needed for big compilation targets like OpenJDK | 33 | # Needed for big compilation targets like OpenJDK |
34 | CFLAGS_append_virtclass-native = " -DDEFAULT_MAX_HEAP=1024*MB" | 34 | CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB" |
35 | 35 | ||
36 | # Enforce usage of ecj-initial. | 36 | # Enforce usage of ecj-initial. |
37 | EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ | 37 | EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ |
38 | GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ | 38 | GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ |
39 | " | 39 | " |
40 | 40 | ||
41 | do_install_append_virtclass-native() { | 41 | do_install_append_class-native() { |
42 | install -d ${D}${bindir} | 42 | install -d ${D}${bindir} |
43 | install -m 0755 ${WORKDIR}/java ${D}${bindir}/java | 43 | install -m 0755 ${WORKDIR}/java ${D}${bindir}/java |
44 | 44 | ||