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 | |
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>
-rw-r--r-- | recipes-core/cup/cup_0.10k.bb | 2 | ||||
-rw-r--r-- | recipes-core/jakarta-commons/commons-net_1.4.1.bb | 2 | ||||
-rw-r--r-- | recipes-core/jamvm/jamvm.inc | 14 | ||||
-rw-r--r-- | recipes-core/jcraft/jsch_0.1.40.bb | 2 | ||||
-rw-r--r-- | recipes-core/jikes/jikes_1.22.bb | 4 | ||||
-rw-r--r-- | recipes-core/jlex/jlex_1.2.6.bb | 2 | ||||
-rw-r--r-- | recipes-core/rhino/rhino_1.7r4.bb | 2 | ||||
-rw-r--r-- | recipes-core/xerces-j/xerces-j_2.11.0.bb | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb index 2a957f9..afe5c38 100644 --- a/recipes-core/cup/cup_0.10k.bb +++ b/recipes-core/cup/cup_0.10k.bb | |||
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c | |||
5 | 5 | ||
6 | 6 | ||
7 | RDEPENDS_${PN} = "java2-runtime" | 7 | RDEPENDS_${PN} = "java2-runtime" |
8 | RDEPENDS_${PN}_virtclass-native = "" | 8 | RDEPENDS_${PN}_class-native = "" |
9 | 9 | ||
10 | inherit java-library | 10 | inherit java-library |
11 | 11 | ||
diff --git a/recipes-core/jakarta-commons/commons-net_1.4.1.bb b/recipes-core/jakarta-commons/commons-net_1.4.1.bb index 239907e..ec8a3df 100644 --- a/recipes-core/jakarta-commons/commons-net_1.4.1.bb +++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb | |||
@@ -12,7 +12,7 @@ S = "${WORKDIR}/${BP}" | |||
12 | DEPENDS += "oro" | 12 | DEPENDS += "oro" |
13 | 13 | ||
14 | RDEPENDS_${PN} = "liboro-java" | 14 | RDEPENDS_${PN} = "liboro-java" |
15 | RDEPENDS_${PN}_virtclass-native = "" | 15 | RDEPENDS_${PN}_class-native = "" |
16 | 16 | ||
17 | CP = "oro" | 17 | CP = "oro" |
18 | 18 | ||
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 | ||
diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb index 0be0883..6450540 100644 --- a/recipes-core/jcraft/jsch_0.1.40.bb +++ b/recipes-core/jcraft/jsch_0.1.40.bb | |||
@@ -10,7 +10,7 @@ inherit java-library | |||
10 | DEPENDS = "jzlib" | 10 | DEPENDS = "jzlib" |
11 | 11 | ||
12 | RDEPENDS_${PN} = "libjzlib-java" | 12 | RDEPENDS_${PN} = "libjzlib-java" |
13 | RDEPENDS_${PN}_virtclass-native = "" | 13 | RDEPENDS_${PN}_class-native = "" |
14 | 14 | ||
15 | do_compile() { | 15 | do_compile() { |
16 | mkdir -p build | 16 | mkdir -p build |
diff --git a/recipes-core/jikes/jikes_1.22.bb b/recipes-core/jikes/jikes_1.22.bb index a35cfcf..8f97a1c 100644 --- a/recipes-core/jikes/jikes_1.22.bb +++ b/recipes-core/jikes/jikes_1.22.bb | |||
@@ -14,8 +14,8 @@ inherit autotools update-alternatives relative_symlinks | |||
14 | BBCLASSEXTEND = "native" | 14 | BBCLASSEXTEND = "native" |
15 | 15 | ||
16 | RDEPENDS_${PN} = "classpath" | 16 | RDEPENDS_${PN} = "classpath" |
17 | PROVIDES_virtclass-native = "" | 17 | PROVIDES_class-native = "" |
18 | RDEPENDS_${PN}_virtclass-native = "" | 18 | RDEPENDS_${PN}_class-native = "" |
19 | 19 | ||
20 | EXTRA_OECONF = "--disable-fp-emulation --enable-source15" | 20 | EXTRA_OECONF = "--disable-fp-emulation --enable-source15" |
21 | 21 | ||
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb index bb67a46..8cb0316 100644 --- a/recipes-core/jlex/jlex_1.2.6.bb +++ b/recipes-core/jlex/jlex_1.2.6.bb | |||
@@ -4,7 +4,7 @@ LICENSE = "JLEX" | |||
4 | LIC_FILES_CHKSUM = "file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" | 4 | LIC_FILES_CHKSUM = "file://Main.java;beginline=148;endline=166;md5=9bf4a6a951053991db64f9d7330d648a" |
5 | 5 | ||
6 | RDEPENDS_${PN} = "java2-runtime" | 6 | RDEPENDS_${PN} = "java2-runtime" |
7 | RDEPENDS_${PN}_virtclass-native = "" | 7 | RDEPENDS_${PN}_class-native = "" |
8 | 8 | ||
9 | inherit java-library | 9 | inherit java-library |
10 | 10 | ||
diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb index 30d5a62..df6a0f7 100644 --- a/recipes-core/rhino/rhino_1.7r4.bb +++ b/recipes-core/rhino/rhino_1.7r4.bb | |||
@@ -20,7 +20,7 @@ PACKAGES = "${JPN} rhino" | |||
20 | 20 | ||
21 | FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" | 21 | FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" |
22 | RDEPENDS_${PN} = "java2-runtime ${JPN}" | 22 | RDEPENDS_${PN} = "java2-runtime ${JPN}" |
23 | RDEPENDS_${PN}_virtclass-native = "" | 23 | RDEPENDS_${PN}_class-native = "" |
24 | 24 | ||
25 | do_compile() { | 25 | do_compile() { |
26 | mkdir -p build | 26 | mkdir -p build |
diff --git a/recipes-core/xerces-j/xerces-j_2.11.0.bb b/recipes-core/xerces-j/xerces-j_2.11.0.bb index 1b96f00..98ef32f 100644 --- a/recipes-core/xerces-j/xerces-j_2.11.0.bb +++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb | |||
@@ -23,7 +23,7 @@ JPN = "libxerces2-java" | |||
23 | DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" | 23 | DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" |
24 | 24 | ||
25 | RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" | 25 | RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" |
26 | RDEPENDS_${PN}_virtclass-native = "" | 26 | RDEPENDS_${PN}_class-native = "" |
27 | 27 | ||
28 | do_unpackpost[dirs] = "${B}" | 28 | do_unpackpost[dirs] = "${B}" |
29 | do_unpackpost() { | 29 | do_unpackpost() { |