summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorAJ Bagwell <anthony.bagwell@hivehome.com>2021-08-09 14:09:37 +0100
committerRichard Leitner <richard.leitner@skidata.com>2021-08-11 07:19:27 +0200
commitb71a9866abfd5292650ef0afc5ecb9ab5e29b887 (patch)
tree8e7cfd6025f06b4138e2f5fbca61dce7d3a13bac /recipes-core
parent984f25b6deb5fe4acf82d51c04b2c1392a542723 (diff)
downloadmeta-java-b71a9866abfd5292650ef0afc5ecb9ab5e29b887.tar.gz
all: run convert-overrides (0.9.3) script to convert to new override format
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/ant/ant-native_1.8.1.bb6
-rw-r--r--recipes-core/antlr/antlr_2.7.7.bb6
-rw-r--r--recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb12
-rw-r--r--recipes-core/cacao/cacao-initial-native_0.98.bb2
-rw-r--r--recipes-core/cacao/cacao_git.bb24
-rw-r--r--recipes-core/classpath/classpath-initial-native_0.93.bb2
-rw-r--r--recipes-core/classpath/classpath-native_0.99.bb2
-rw-r--r--recipes-core/classpath/classpath.inc38
-rw-r--r--recipes-core/cup/cup_0.10k.bb8
-rw-r--r--recipes-core/fastjar/fastjar.inc6
-rw-r--r--recipes-core/icedtea/icedtea7-native.inc20
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc4
-rw-r--r--recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-configuration_1.5.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-digester_1.8.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-discovery_0.4.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-el_1.0.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-httpclient_3.1.bb4
-rw-r--r--recipes-core/jakarta-commons/commons-jxpath_1.3.bb2
-rw-r--r--recipes-core/jakarta-commons/commons-net_1.4.1.bb4
-rw-r--r--recipes-core/jamvm/jamvm-initial-native_1.4.5.bb2
-rw-r--r--recipes-core/jamvm/jamvm.inc28
-rw-r--r--recipes-core/jamvm/jamvm_git.bb2
-rw-r--r--recipes-core/javasqlite/javasqlite_20150419.bb10
-rw-r--r--recipes-core/jcraft/jsch_0.1.40.bb4
-rw-r--r--recipes-core/jikes/jikes_1.22.bb10
-rw-r--r--recipes-core/jlex/jlex_1.2.6.bb8
-rw-r--r--recipes-core/junit/junit_3.8.2.bb4
-rw-r--r--recipes-core/libmatthew/libmatthew.inc22
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc76
-rw-r--r--recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb2
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc16
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc14
-rw-r--r--recipes-core/openjdk/openjdk-8-native.inc18
-rw-r--r--recipes-core/openjdk/openjdk-8-release-aarch32.inc30
-rw-r--r--recipes-core/openjdk/openjdk-8-release-aarch64.inc16
-rw-r--r--recipes-core/openjdk/openjdk-8-release-common.inc54
-rw-r--r--recipes-core/openjdk/openjdk-8-release.inc4
-rw-r--r--recipes-core/openjdk/openjdk-8_272.bb24
-rw-r--r--recipes-core/openjdk/openjre-8_272.bb16
-rw-r--r--recipes-core/rhino/rhino_1.7r4.bb10
-rw-r--r--recipes-core/servlet-api/jsp2.0_5.5.26.bb2
-rw-r--r--recipes-core/xalan-j/xalan-j_2.7.1.bb4
-rw-r--r--recipes-core/xerces-j/xerces-j_2.11.0.bb4
-rw-r--r--recipes-core/xml-commons/jaxme_0.5.2.bb2
-rw-r--r--recipes-core/xml-commons/xom_1.2.10.bb2
-rw-r--r--recipes-core/xml-commons/xpp3_1.1.3.4.O.bb4
48 files changed, 270 insertions, 270 deletions
diff --git a/recipes-core/ant/ant-native_1.8.1.bb b/recipes-core/ant/ant-native_1.8.1.bb
index 7839abd..fa37dd1 100644
--- a/recipes-core/ant/ant-native_1.8.1.bb
+++ b/recipes-core/ant/ant-native_1.8.1.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
20 junit-native jdepend-native commons-net-native commons-logging-native \ 20 junit-native jdepend-native commons-net-native commons-logging-native \
21 " 21 "
22 22
23do_removecruft() { 23do:removecruft() {
24 # Removes thing that need proprietary Jar files or are otherwise problematic 24 # Removes thing that need proprietary Jar files or are otherwise problematic
25 rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/image 25 rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/image
26 rm -rf ${S}/src/main/org/apache/tools/ant/types/optional/image 26 rm -rf ${S}/src/main/org/apache/tools/ant/types/optional/image
@@ -30,7 +30,7 @@ do_removecruft() {
30 rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java 30 rm -rf ${S}/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
31} 31}
32 32
33addtask removecruft before do_patch after do_removebinaries 33addtask removecruft before do_patch after do:removebinaries
34 34
35do_compile() { 35do_compile() {
36 mkdir -p build 36 mkdir -p build
@@ -57,7 +57,7 @@ do_compile() {
57 sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant 57 sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant
58} 58}
59 59
60do_install_append() { 60do_install:append() {
61 install -d ${D}${bindir} 61 install -d ${D}${bindir}
62 install -m 0755 ${WORKDIR}/ant ${D}${bindir} 62 install -m 0755 ${WORKDIR}/ant ${D}${bindir}
63} 63}
diff --git a/recipes-core/antlr/antlr_2.7.7.bb b/recipes-core/antlr/antlr_2.7.7.bb
index d2453a9..d744201 100644
--- a/recipes-core/antlr/antlr_2.7.7.bb
+++ b/recipes-core/antlr/antlr_2.7.7.bb
@@ -5,11 +5,11 @@ LICENSE = "PD"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65" 5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=361934e706423915b4d9f413ad37fb65"
6 6
7SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz" 7SRC_URI = "http://www.antlr2.org/download/${BP}.tar.gz"
8SRC_URI_append_class-native = " file://runantlr" 8SRC_URI:append:class-native = " file://runantlr"
9 9
10inherit java-library 10inherit java-library
11 11
12do_configure_class-native() { 12do_configure:class-native() {
13 sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr 13 sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr
14} 14}
15 15
@@ -21,7 +21,7 @@ do_compile() {
21 fastjar cf ${JARFILENAME} -C build . 21 fastjar cf ${JARFILENAME} -C build .
22} 22}
23 23
24do_install_class-native() { 24do_install:class-native() {
25 install -d ${D}${bindir} 25 install -d ${D}${bindir}
26 install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/ 26 install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/
27} 27}
diff --git a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
index feaa7dc..460d39a 100644
--- a/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
+++ b/recipes-core/ca-certificates-java/ca-certificates-java_20180516.bb
@@ -37,7 +37,7 @@ python () {
37 raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime) 37 raise bb.parse.SkipRecipe("PREFERRED_RPROVIDER_java2-runtime '%s' unsupported" % runtime)
38} 38}
39 39
40do_patch_append () { 40do_patch:append () {
41 bb.build.exec_func('do_fix_sysconfdir', d) 41 bb.build.exec_func('do_fix_sysconfdir', d)
42} 42}
43 43
@@ -78,7 +78,7 @@ do_install () {
78 ${D}${sbindir}/create-ca-certificates-java 78 ${D}${sbindir}/create-ca-certificates-java
79} 79}
80 80
81pkg_postinst_${PN} () { 81pkg_postinst:${PN} () {
82 if [ -n "$D" ] ; then 82 if [ -n "$D" ] ; then
83 # In this case we want to use the Java in the image recipe's 83 # In this case we want to use the Java in the image recipe's
84 # native sysroot (native Java, not qemu target Java) to 84 # native sysroot (native Java, not qemu target Java) to
@@ -98,10 +98,10 @@ pkg_postinst_${PN} () {
98 JVM_LIBDIR=$JVM_LIBDIR $D${sbindir}/create-ca-certificates-java 98 JVM_LIBDIR=$JVM_LIBDIR $D${sbindir}/create-ca-certificates-java
99} 99}
100 100
101RDEPENDS_${PN} = "ca-certificates" 101RDEPENDS:${PN} = "ca-certificates"
102RDEPENDS_${PN}_append_class-target = " java2-runtime" 102RDEPENDS:${PN}:append:class-target = " java2-runtime"
103RDEPENDS_${PN}_append_class-native = " virtual/java-native" 103RDEPENDS:${PN}:append:class-native = " virtual/java-native"
104 104
105FILES_${PN} += "${datadir_java}" 105FILES:${PN} += "${datadir_java}"
106 106
107BBCLASSEXTEND = "native" 107BBCLASSEXTEND = "native"
diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb
index a43d3f4..8432456 100644
--- a/recipes-core/cacao/cacao-initial-native_0.98.bb
+++ b/recipes-core/cacao/cacao-initial-native_0.98.bb
@@ -35,7 +35,7 @@ export JAVAC="jikes-initial"
35# enforces the usage of fastjar 35# enforces the usage of fastjar
36export JAR="fastjar" 36export JAR="fastjar"
37 37
38do_configure_append() { 38do_configure:append() {
39 # Fix the executable name in the wrapper script. 39 # Fix the executable name in the wrapper script.
40 sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in 40 sed -i -e "s|exec cacao \\$|exec cacao-initial \\$|" src/scripts/java.in
41} 41}
diff --git a/recipes-core/cacao/cacao_git.bb b/recipes-core/cacao/cacao_git.bb
index 1a61e12..29aa24f 100644
--- a/recipes-core/cacao/cacao_git.bb
+++ b/recipes-core/cacao/cacao_git.bb
@@ -4,11 +4,11 @@ LICENSE = "GPL-2.0"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5SECTION = "interpreters" 5SECTION = "interpreters"
6 6
7DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-initial-native classpath-native bdwgc-native virtual/java-initial-native" 7DEPENDS:class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-initial-native classpath-native bdwgc-native virtual/java-initial-native"
8PROVIDES_class-native = "virtual/java-native" 8PROVIDES:class-native = "virtual/java-native"
9 9
10DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc" 10DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc"
11RPROVIDES_${PN} = "java2-runtime" 11RPROVIDES:${PN} = "java2-runtime"
12 12
13SRCREV = "6c4694f9bd175386a8c451531e9a5ad97aa23b6f" 13SRCREV = "6c4694f9bd175386a8c451531e9a5ad97aa23b6f"
14SRC_URI = "git://bitbucket.org/cacaovm/cacao.git;protocol=https \ 14SRC_URI = "git://bitbucket.org/cacaovm/cacao.git;protocol=https \
@@ -20,9 +20,9 @@ S = "${WORKDIR}/git"
20inherit java autotools-brokensep update-alternatives pkgconfig features_check 20inherit java autotools-brokensep update-alternatives pkgconfig features_check
21 21
22REQUIRED_DISTRO_FEATURES = "x11" 22REQUIRED_DISTRO_FEATURES = "x11"
23REQUIRED_DISTRO_FEATURES_class-native := "" 23REQUIRED_DISTRO_FEATURES:class-native := ""
24 24
25EXTRA_OECONF_class-native = "\ 25EXTRA_OECONF:class-native = "\
26 --enable-debug \ 26 --enable-debug \
27 --with-vm-zip=${datadir}/cacao/vm.zip \ 27 --with-vm-zip=${datadir}/cacao/vm.zip \
28 --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ 28 --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
@@ -33,7 +33,7 @@ EXTRA_OECONF_class-native = "\
33 --disable-libjvm \ 33 --disable-libjvm \
34" 34"
35 35
36CACHED_CONFIGUREVARS_class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial" 36CACHED_CONFIGUREVARS:class-native += "ac_cv_prog_JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial"
37 37
38EXTRA_OECONF = "\ 38EXTRA_OECONF = "\
39 --with-vm-zip=${datadir}/cacao/vm.zip \ 39 --with-vm-zip=${datadir}/cacao/vm.zip \
@@ -46,21 +46,21 @@ EXTRA_OECONF = "\
46 --disable-test-dependency-checks \ 46 --disable-test-dependency-checks \
47" 47"
48 48
49do_configure_prepend () { 49do_configure:prepend () {
50 # upgrade m4 macros in source tree 50 # upgrade m4 macros in source tree
51 libtoolize --force --copy --install 51 libtoolize --force --copy --install
52 rm -f src/mm/boehm-gc/ltmain.sh 52 rm -f src/mm/boehm-gc/ltmain.sh
53 mkdir -p src/mm/boehm-gc/m4 53 mkdir -p src/mm/boehm-gc/m4
54} 54}
55 55
56do_install_append_class-target() { 56do_install:append:class-target() {
57 rm ${D}/${bindir}/java 57 rm ${D}/${bindir}/java
58} 58}
59 59
60FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}" 60FILES:${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}"
61FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*" 61FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
62FILES_${PN}-doc += "${datadir}/gc" 62FILES:${PN}-doc += "${datadir}/gc"
63 63
64BBCLASSEXTEND = "native" 64BBCLASSEXTEND = "native"
65 65
66COMPATIBLE_MACHINE_aarch64 = "-" 66COMPATIBLE_MACHINE:aarch64 = "-"
diff --git a/recipes-core/classpath/classpath-initial-native_0.93.bb b/recipes-core/classpath/classpath-initial-native_0.93.bb
index 51229ec..7bb1ca1 100644
--- a/recipes-core/classpath/classpath-initial-native_0.93.bb
+++ b/recipes-core/classpath/classpath-initial-native_0.93.bb
@@ -28,7 +28,7 @@ EXTRA_OECONF += "\
28# Ensure tools.zip is not installed at same path as classpath-native 28# Ensure tools.zip is not installed at same path as classpath-native
29EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" 29EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial"
30 30
31do_install_append() { 31do_install:append() {
32 # remove files clashing with classpath-native in sysroot 32 # remove files clashing with classpath-native in sysroot
33 rm \ 33 rm \
34 ${D}${bindir}/gappletviewer \ 34 ${D}${bindir}/gappletviewer \
diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb
index daf7611..ecf8c0a 100644
--- a/recipes-core/classpath/classpath-native_0.99.bb
+++ b/recipes-core/classpath/classpath-native_0.99.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF += "\
23 --includedir=${STAGING_INCDIR}/classpath \ 23 --includedir=${STAGING_INCDIR}/classpath \
24" 24"
25 25
26do_compile_append () { 26do_compile:append () {
27 # tools using java-initial rather than java sed it out 27 # tools using java-initial rather than java sed it out
28 cd tools 28 cd tools
29 sed -e "s/java-initial/java/g" \ 29 sed -e "s/java-initial/java/g" \
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index e23b752..42c5daf 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -11,15 +11,15 @@ inherit autotools java gettext
11 11
12DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file" 12DEPENDS = "virtual/javac-native fastjar-native zip-native gmp antlr-native gtk+ gconf libxtst file"
13 13
14RPROVIDES_${PN} = "" 14RPROVIDES:${PN} = ""
15 15
16RDEPENDS_${PN} = "${PBN}-common (>= ${PV})" 16RDEPENDS:${PN} = "${PBN}-common (>= ${PV})"
17RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt" 17RDEPENDS:${PN}-examples = "java2-runtime ${PN}-awt"
18RDEPENDS_${PN}-tools = "java2-runtime" 18RDEPENDS:${PN}-tools = "java2-runtime"
19 19
20RPROVIDES_${PN} = "${PBN}" 20RPROVIDES:${PN} = "${PBN}"
21RPROVIDES_${PN}-common = "${PBN}-common" 21RPROVIDES:${PN}-common = "${PBN}-common"
22RPROVIDES_${PN}-gtk = "${PBN}-awt" 22RPROVIDES:${PN}-gtk = "${PBN}-awt"
23 23
24PR = "r3" 24PR = "r3"
25 25
@@ -49,7 +49,7 @@ EXTRA_OECONF = "\
49EXTRA_OECONF += "\ 49EXTRA_OECONF += "\
50 " 50 "
51 51
52do_configure_prepend () { 52do_configure:prepend () {
53 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} 53 cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S}
54} 54}
55 55
@@ -60,7 +60,7 @@ do_install() {
60} 60}
61 61
62# We really have valid non-symlink .so files 62# We really have valid non-symlink .so files
63INSANE_SKIP_${PN} = "dev-so" 63INSANE_SKIP:${PN} = "dev-so"
64 64
65# Defines the packages that this classpath recipe creates. 65# Defines the packages that this classpath recipe creates.
66# This allows the classpath-minimal variants to override this 66# This allows the classpath-minimal variants to override this
@@ -71,20 +71,20 @@ CPPACKAGES = "${PBN}-common ${PN}-examples \
71 71
72PACKAGES =+ "${CPPACKAGES}" 72PACKAGES =+ "${CPPACKAGES}"
73 73
74FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}" 74FILES:${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}"
75 75
76FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security" 76FILES:${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security"
77FILES_${PN}-examples = "${datadir}/${PBN}/examples" 77FILES:${PN}-examples = "${datadir}/${PBN}/examples"
78 78
79FILES_${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}" 79FILES:${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}"
80FILES_${PN}-tools-doc = "${mandir}" 80FILES:${PN}-tools-doc = "${mandir}"
81 81
82FILES_${PN}-dbg += "${libdir}/${PBN}/.debug" 82FILES:${PN}-dbg += "${libdir}/${PBN}/.debug"
83FILES_${PN}-doc = "${infodir}" 83FILES:${PN}-doc = "${infodir}"
84 84
85# gcjwebplugin - not built yet 85# gcjwebplugin - not built yet
86#FILES_${PN}-gcjwebplugin = "${libdir}/${PBN}/libgcjwebplugin.so" 86#FILES_${PN}-gcjwebplugin = "${libdir}/${PBN}/libgcjwebplugin.so"
87FILES_${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so ${libdir}/${PBN}/libjawt.so" 87FILES:${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so ${libdir}/${PBN}/libjawt.so"
88FILES_${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so" 88FILES:${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so"
89FILES_${PN} = "${libdir}/${PBN}/lib*so*" 89FILES:${PN} = "${libdir}/${PBN}/lib*so*"
90 90
diff --git a/recipes-core/cup/cup_0.10k.bb b/recipes-core/cup/cup_0.10k.bb
index 3ce5a21..ce81453 100644
--- a/recipes-core/cup/cup_0.10k.bb
+++ b/recipes-core/cup/cup_0.10k.bb
@@ -4,8 +4,8 @@ LICENSE = "CUP"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33"
5 5
6 6
7RDEPENDS_${PN} = "java2-runtime" 7RDEPENDS:${PN} = "java2-runtime"
8RDEPENDS_${PN}_class-native = "" 8RDEPENDS:${PN}:class-native = ""
9PACKAGE_ARCH = "${TUNE_PKGARCH}" 9PACKAGE_ARCH = "${TUNE_PKGARCH}"
10 10
11inherit java-library 11inherit java-library
@@ -32,14 +32,14 @@ do_compile() {
32 fastjar cf ${BP}.jar -C build . 32 fastjar cf ${BP}.jar -C build .
33} 33}
34 34
35do_install_append() { 35do_install:append() {
36 install -d ${D}${bindir} 36 install -d ${D}${bindir}
37 install -m 0755 ${WORKDIR}/cup ${D}${bindir} 37 install -m 0755 ${WORKDIR}/cup ${D}${bindir}
38} 38}
39 39
40PACKAGES = "${PN}" 40PACKAGES = "${PN}"
41 41
42FILES_${PN} += "${datadir_java}" 42FILES:${PN} += "${datadir_java}"
43 43
44SRC_URI[md5sum] = "8b11edfec13c590ea443d0f0ae0da479" 44SRC_URI[md5sum] = "8b11edfec13c590ea443d0f0ae0da479"
45SRC_URI[sha256sum] = "7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd" 45SRC_URI[sha256sum] = "7e6dc5be74ae56c7e86e69ad0ad88dae3b2847afa9e73a76635918a6b1eb75cd"
diff --git a/recipes-core/fastjar/fastjar.inc b/recipes-core/fastjar/fastjar.inc
index 2a40e3c..8412236 100644
--- a/recipes-core/fastjar/fastjar.inc
+++ b/recipes-core/fastjar/fastjar.inc
@@ -12,15 +12,15 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.ta
12inherit autotools update-alternatives 12inherit autotools update-alternatives
13 13
14PACKAGES = "${PN}-grepjar ${PN} ${PN}-dbg ${PN}-doc" 14PACKAGES = "${PN}-grepjar ${PN} ${PN}-dbg ${PN}-doc"
15FILES_${PN}-grepjar = "${bindir}/grepjar" 15FILES:${PN}-grepjar = "${bindir}/grepjar"
16 16
17PROVIDES = "virtual/jar" 17PROVIDES = "virtual/jar"
18ALTERNATIVE_${PN} = "jar" 18ALTERNATIVE:${PN} = "jar"
19ALTERNATIVE_LINK = "${bindir}/jar" 19ALTERNATIVE_LINK = "${bindir}/jar"
20ALTERNATIVE_TARGET = "${bindir}/fastjar" 20ALTERNATIVE_TARGET = "${bindir}/fastjar"
21 21
22# update-aternatives does not work for native class 22# update-aternatives does not work for native class
23do_install_append_class-native () { 23do_install:append:class-native () {
24 ln -s fastjar ${D}${bindir}/jar 24 ln -s fastjar ${D}${bindir}/jar
25} 25}
26 26
diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc
index f53715f..331b7a4 100644
--- a/recipes-core/icedtea/icedtea7-native.inc
+++ b/recipes-core/icedtea/icedtea7-native.inc
@@ -16,25 +16,25 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}
16PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native" 16PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xorgproto-native libxt-native libxext-native libxrender-native"
17 17
18OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}" 18OEMAKE_BUILD_HEADLESS_ONLY = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
19CFLAGS_append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}" 19CFLAGS:append = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
20 20
21# Disable dead store elimination and set C++ standard to C++98. 21# Disable dead store elimination and set C++ standard to C++98.
22# There are dead stores in the JVM that would be pretty hard to 22# There are dead stores in the JVM that would be pretty hard to
23# remove, so disable the optimisation in the compiler. 23# remove, so disable the optimisation in the compiler.
24CFLAGS_append = " -fno-tree-dse" 24CFLAGS:append = " -fno-tree-dse"
25CXXFLAGS_append = " -fno-tree-dse" 25CXXFLAGS:append = " -fno-tree-dse"
26CXX_append = " -std=gnu++98" 26CXX:append = " -std=gnu++98"
27 27
28# WORKAROUND: ignore errors from new compilers 28# WORKAROUND: ignore errors from new compilers
29CFLAGS_append = " -Wno-error=stringop-overflow -Wno-error=return-type" 29CFLAGS:append = " -Wno-error=stringop-overflow -Wno-error=return-type"
30 30
31# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9" 31# oe.utils.get_host_compiler_version returns "gcc, 9.2" and we want -> "9"
32HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}" 32HOST_COMPILER_MAJOR="${@oe.utils.get_host_compiler_version(d)[1].split(".", 2)[0]}"
33# if compiler version 9 detected, add more CFLAGS 33# if compiler version 9 detected, add more CFLAGS
34CFLAGS_append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}" 34CFLAGS:append = " ${@oe.utils.conditional('HOST_COMPILER_MAJOR', '9', '-Wno-error=format-overflow', '', d)}"
35 35
36# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources 36# Explicitly pass -fcommon since GCC 10 defaults to -fno-common for C sources
37CFLAGS_append = " -fcommon" 37CFLAGS:append = " -fcommon"
38 38
39inherit java autotools pkgconfig 39inherit java autotools pkgconfig
40inherit openjdk-build-helper 40inherit openjdk-build-helper
@@ -71,7 +71,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
71 71
72# libfreetype.so.6 is copied from STAGING_LIBDIR 72# libfreetype.so.6 is copied from STAGING_LIBDIR
73# which is already stripped. 73# which is already stripped.
74INSANE_SKIP_${PN} = "already-stripped" 74INSANE_SKIP:${PN} = "already-stripped"
75 75
76EXTRA_OECONF = "\ 76EXTRA_OECONF = "\
77 --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 77 --with-parallel-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
@@ -101,7 +101,7 @@ JDK_DIR = "icedtea7-native"
101 101
102JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" 102JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}"
103 103
104do_configure_prepend() { 104do_configure:prepend() {
105 arch="${@openjdk_build_helper_get_icedtea_arch(d)}" 105 arch="${@openjdk_build_helper_get_icedtea_arch(d)}"
106 libarch="${@openjdk_build_helper_get_icedtea_arch(d)}" 106 libarch="${@openjdk_build_helper_get_icedtea_arch(d)}"
107 107
@@ -132,7 +132,7 @@ do_configure_prepend() {
132 132
133POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}" 133POST_CONFIGURE_CLEAN_X11 = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '', 'rm openjdk*/jdk/src/solaris/classes/sun/awt/X11/*.java', d)}"
134 134
135do_configure_append() { 135do_configure:append() {
136 oe_runmake patch-fsg 136 oe_runmake patch-fsg
137 137
138 for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; 138 for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ;
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 627501c..16bf592 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:" 5FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:"
6 6
7# Force arm mode for now 7# Force arm mode for now
8ARM_INSTRUCTION_SET_armv4t = "ARM" 8ARM_INSTRUCTION_SET:armv4t = "ARM"
9 9
10ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" 10ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced"
11 11
@@ -133,4 +133,4 @@ export DISTRIBUTION_PATCHES = " \
133 133
134# readdir_r was deprecated in glibc-2.24. Ignore the error for now 134# readdir_r was deprecated in glibc-2.24. Ignore the error for now
135# NOTE: When updating the recipe, please check if this is still needed 135# NOTE: When updating the recipe, please check if this is still needed
136CFLAGS_append = " -Wno-error=deprecated-declarations" 136CFLAGS:append = " -Wno-error=deprecated-declarations"
diff --git a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
index 06287f6..2c5ecc2 100644
--- a/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
+++ b/recipes-core/jakarta-commons/commons-beanutils_1.8.0.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "Static utility methods useful in manipulating Java classes that c
7SRC_URI = "http://www.apache.org/dist/commons/beanutils/source/${BP}-src.tar.gz" 7SRC_URI = "http://www.apache.org/dist/commons/beanutils/source/${BP}-src.tar.gz"
8 8
9DEPENDS += "commons-collections3 commons-logging" 9DEPENDS += "commons-collections3 commons-logging"
10RDEPENDS_${PN} = "libcommons-collections3-java libcommons-logging-java" 10RDEPENDS:${PN} = "libcommons-collections3-java libcommons-logging-java"
11 11
12CP = "commons-collections3 commons-logging" 12CP = "commons-collections3 commons-logging"
13 13
diff --git a/recipes-core/jakarta-commons/commons-configuration_1.5.bb b/recipes-core/jakarta-commons/commons-configuration_1.5.bb
index 0f8a166..4c2bce1 100644
--- a/recipes-core/jakarta-commons/commons-configuration_1.5.bb
+++ b/recipes-core/jakarta-commons/commons-configuration_1.5.bb
@@ -12,7 +12,7 @@ SRC_URI = " \
12PNBLACKLIST[commons-configuration] ?= "BROKEN: indirectly depends on broken 'xom'" 12PNBLACKLIST[commons-configuration] ?= "BROKEN: indirectly depends on broken 'xom'"
13 13
14DEPENDS += "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet2.4" 14DEPENDS += "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet2.4"
15RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libcommons-codec-java libcommons-digester-java libcommons-jxpath-java libcommons-lang-java libservlet2.4-java" 15RDEPENDS:${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libcommons-codec-java libcommons-digester-java libcommons-jxpath-java libcommons-lang-java libservlet2.4-java"
16 16
17CP = "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet-api-2.4" 17CP = "commons-logging commons-collections3 commons-beanutils commons-codec commons-digester commons-jxpath commons-lang servlet-api-2.4"
18 18
diff --git a/recipes-core/jakarta-commons/commons-digester_1.8.bb b/recipes-core/jakarta-commons/commons-digester_1.8.bb
index 0f079f1..de264b8 100644
--- a/recipes-core/jakarta-commons/commons-digester_1.8.bb
+++ b/recipes-core/jakarta-commons/commons-digester_1.8.bb
@@ -7,7 +7,7 @@ SUMMARY = "Converts XML to a Java object by a set of mapping rules."
7SRC_URI = "http://archive.apache.org/dist/commons/digester/source/${BP}-src.tar.gz" 7SRC_URI = "http://archive.apache.org/dist/commons/digester/source/${BP}-src.tar.gz"
8 8
9DEPENDS += "commons-logging commons-beanutils" 9DEPENDS += "commons-logging commons-beanutils"
10RDEPENDS_${PN} = "libcommons-logging-java libcommons-beanutils-java" 10RDEPENDS:${PN} = "libcommons-logging-java libcommons-beanutils-java"
11 11
12CP = "commons-logging commons-beanutils" 12CP = "commons-logging commons-beanutils"
13 13
diff --git a/recipes-core/jakarta-commons/commons-discovery_0.4.bb b/recipes-core/jakarta-commons/commons-discovery_0.4.bb
index 01cb54e..aa87349 100644
--- a/recipes-core/jakarta-commons/commons-discovery_0.4.bb
+++ b/recipes-core/jakarta-commons/commons-discovery_0.4.bb
@@ -8,7 +8,7 @@ SUMMARY = "discovering, or finding, implementations for pluggable interfaces"
8SRC_URI = "http://archive.apache.org/dist/commons/discovery/source/${BP}-src.tar.gz" 8SRC_URI = "http://archive.apache.org/dist/commons/discovery/source/${BP}-src.tar.gz"
9 9
10DEPENDS += "commons-logging" 10DEPENDS += "commons-logging"
11RDEPENDS_${PN} = "libcommons-logging-java" 11RDEPENDS:${PN} = "libcommons-logging-java"
12 12
13CP = "commons-logging" 13CP = "commons-logging"
14 14
diff --git a/recipes-core/jakarta-commons/commons-el_1.0.bb b/recipes-core/jakarta-commons/commons-el_1.0.bb
index 4174dce..bb4c35b 100644
--- a/recipes-core/jakarta-commons/commons-el_1.0.bb
+++ b/recipes-core/jakarta-commons/commons-el_1.0.bb
@@ -8,7 +8,7 @@ SUMMARY = "Implementation of the JSP2.0 Expression Language API"
8SRC_URI = "http://archive.apache.org/dist/commons/el/source/${BP}-src.tar.gz" 8SRC_URI = "http://archive.apache.org/dist/commons/el/source/${BP}-src.tar.gz"
9 9
10DEPENDS += "jsp2.0 servlet2.4" 10DEPENDS += "jsp2.0 servlet2.4"
11RDEPENDS_${PN} = "libjsp2.0-java libservlet2.4-java" 11RDEPENDS:${PN} = "libjsp2.0-java libservlet2.4-java"
12 12
13CP = "jsp-api-2.0 servlet-api-2.4" 13CP = "jsp-api-2.0 servlet-api-2.4"
14 14
diff --git a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
index dab7996..395fa15 100644
--- a/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
+++ b/recipes-core/jakarta-commons/commons-fileupload_1.2.1.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Robust, high-performance, file upload capability for Java servlet
8SRC_URI = "http://archive.apache.org/dist/commons/fileupload/source/${BP}-src.tar.gz" 8SRC_URI = "http://archive.apache.org/dist/commons/fileupload/source/${BP}-src.tar.gz"
9 9
10DEPENDS += "commons-beanutils commons-io servlet2.3" 10DEPENDS += "commons-beanutils commons-io servlet2.3"
11RDEPENDS_${PN} = "libcommons-beanutils-java libcommons-io-java libservlet2.3-java" 11RDEPENDS:${PN} = "libcommons-beanutils-java libcommons-io-java libservlet2.3-java"
12 12
13CP = "commons-beanutils commons-io servlet-2.3" 13CP = "commons-beanutils commons-io servlet-2.3"
14 14
diff --git a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
index 8daed1b..a6fb53b 100644
--- a/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
+++ b/recipes-core/jakarta-commons/commons-httpclient_3.1.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://archive.apache.org/dist/httpcomponents/commons-httpclient/sour
10S = "${WORKDIR}/${BP}" 10S = "${WORKDIR}/${BP}"
11 11
12DEPENDS += "commons-logging commons-codec" 12DEPENDS += "commons-logging commons-codec"
13RDEPENDS_${PN} = "libcommons-logging-java libcommons-codec-java" 13RDEPENDS:${PN} = "libcommons-logging-java libcommons-codec-java"
14RDEPENDS_${PN}_class-native = "" 14RDEPENDS:${PN}:class-native = ""
15 15
16CP = "commons-logging commons-codec" 16CP = "commons-logging commons-codec"
17 17
diff --git a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
index 3561444..5f44315 100644
--- a/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
+++ b/recipes-core/jakarta-commons/commons-jxpath_1.3.bb
@@ -9,7 +9,7 @@ SRC_URI = "http://archive.apache.org/dist/commons/jxpath/source/${BP}-src.tar.gz
9PNBLACKLIST[commons-jxpath] ?= "BROKEN: indirectly depends on broken 'xom'" 9PNBLACKLIST[commons-jxpath] ?= "BROKEN: indirectly depends on broken 'xom'"
10 10
11DEPENDS += "commons-logging commons-collections3 commons-beanutils servlet2.3 jdom" 11DEPENDS += "commons-logging commons-collections3 commons-beanutils servlet2.3 jdom"
12RDEPENDS_${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libservlet2.3-java libjdom-java" 12RDEPENDS:${PN} = "libcommons-logging-java libcommons-collections3-java libcommons-beanutils-java libservlet2.3-java libjdom-java"
13 13
14CP = "commons-logging commons-collections3 commons-beanutils servlet-2.3 jdom" 14CP = "commons-logging commons-collections3 commons-beanutils servlet-2.3 jdom"
15 15
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 5737c46..ba62ebc 100644
--- a/recipes-core/jakarta-commons/commons-net_1.4.1.bb
+++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb
@@ -11,8 +11,8 @@ S = "${WORKDIR}/${BP}"
11 11
12DEPENDS += "oro" 12DEPENDS += "oro"
13 13
14RDEPENDS_${PN} = "liboro-java" 14RDEPENDS:${PN} = "liboro-java"
15RDEPENDS_${PN}_class-native = "" 15RDEPENDS:${PN}:class-native = ""
16 16
17CP = "oro" 17CP = "oro"
18 18
diff --git a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb
index 1f5921f..f0348a4 100644
--- a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb
+++ b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb
@@ -38,7 +38,7 @@ CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
38EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \ 38EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \
39 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \ 39 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \
40 " 40 "
41do_install_append() { 41do_install:append() {
42 install -d ${D}${bindir}/ 42 install -d ${D}${bindir}/
43 install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ 43 install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/
44} 44}
diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index b03a5b9..693817f 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -4,25 +4,25 @@ LICENSE = "GPL-2.0"
4LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" 4LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
5 5
6DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native" 6DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native"
7DEPENDS_class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native" 7DEPENDS:class-native = "virtual/java-initial-native classpath-initial-native zlib-native classpath-native ecj-initial-native libffi-native"
8 8
9RDEPENDS_${PN} = "classpath" 9RDEPENDS:${PN} = "classpath"
10RDEPENDS_${PN}_class-native = "" 10RDEPENDS:${PN}:class-native = ""
11 11
12PROVIDES_class-native = "virtual/java-native" 12PROVIDES:class-native = "virtual/java-native"
13RPROVIDES_${PN} = "java2-runtime" 13RPROVIDES:${PN} = "java2-runtime"
14RPROVIDES_${PN}_class-native = "" 14RPROVIDES:${PN}:class-native = ""
15 15
16BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"
17 17
18inherit java autotools update-alternatives pkgconfig relative_symlinks features_check 18inherit java autotools update-alternatives pkgconfig relative_symlinks features_check
19 19
20REQUIRED_DISTRO_FEATURES_class-target = "x11" 20REQUIRED_DISTRO_FEATURES:class-target = "x11"
21 21
22# This uses 32 bit arm, so force the instruction set to arm, not thumb 22# This uses 32 bit arm, so force the instruction set to arm, not thumb
23ARM_INSTRUCTION_SET = "arm" 23ARM_INSTRUCTION_SET = "arm"
24 24
25do_configure_append_class-native() { 25do_configure:append:class-native() {
26 sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \ 26 sed -i -e"s|STAGING_LIBDIR_NATIVE|${STAGING_LIBDIR_NATIVE}|g" \
27 -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \ 27 -e "s|STAGING_DATADIR_NATIVE|${STAGING_DATADIR_NATIVE}|g" \
28 ${WORKDIR}/java 28 ${WORKDIR}/java
@@ -32,28 +32,28 @@ do_configure_append_class-native() {
32EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi --disable-int-inlining" 32EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi --disable-int-inlining"
33 33
34# Needed for big compilation targets like OpenJDK 34# Needed for big compilation targets like OpenJDK
35CFLAGS_append_class-native = " -DDEFAULT_MAX_HEAP=1024*MB" 35CFLAGS:append:class-native = " -DDEFAULT_MAX_HEAP=1024*MB"
36 36
37EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \ 37EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/javac \
38 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ 38 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
39 " 39 "
40# Enforce usage of ecj-initial. 40# Enforce usage of ecj-initial.
41EXTRA_OEMAKE_class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \ 41EXTRA_OEMAKE:class-native = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
42 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \ 42 GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath/glibj.zip \
43 " 43 "
44 44
45do_install_append_class-native() { 45do_install:append:class-native() {
46 install -d ${D}${bindir} 46 install -d ${D}${bindir}
47 install -m 0755 ${WORKDIR}/java ${D}${bindir}/java 47 install -m 0755 ${WORKDIR}/java ${D}${bindir}/java
48 48
49} 49}
50 50
51PRIVATE_LIBS = "libjvm.so" 51PRIVATE_LIBS = "libjvm.so"
52INSANE_SKIP_${PN} = "dev-so" 52INSANE_SKIP:${PN} = "dev-so"
53 53
54FILES_${PN} += "${libdir}/jamvm/lib*.so" 54FILES:${PN} += "${libdir}/jamvm/lib*.so"
55 55
56ALTERNATIVE_${PN} = "java" 56ALTERNATIVE:${PN} = "java"
57ALTERNATIVE_TARGET = "${bindir}/jamvm" 57ALTERNATIVE_TARGET = "${bindir}/jamvm"
58ALTERNATIVE_PRIORITY = "4" 58ALTERNATIVE_PRIORITY = "4"
59# shared state for jamvm-native does not work 59# shared state for jamvm-native does not work
diff --git a/recipes-core/jamvm/jamvm_git.bb b/recipes-core/jamvm/jamvm_git.bb
index 57f7e64..3c9d47b 100644
--- a/recipes-core/jamvm/jamvm_git.bb
+++ b/recipes-core/jamvm/jamvm_git.bb
@@ -15,4 +15,4 @@ SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18COMPATIBLE_MACHINE_aarch64 = "-" 18COMPATIBLE_MACHINE:aarch64 = "-"
diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb b/recipes-core/javasqlite/javasqlite_20150419.bb
index 06fbac2..1ae072f 100644
--- a/recipes-core/javasqlite/javasqlite_20150419.bb
+++ b/recipes-core/javasqlite/javasqlite_20150419.bb
@@ -18,8 +18,8 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=3da0e50feac5f64f08184584a8cad58a"
18inherit autotools-brokensep 18inherit autotools-brokensep
19 19
20DEPENDS += "sqlite3 sqlite3-native icedtea7-native" 20DEPENDS += "sqlite3 sqlite3-native icedtea7-native"
21RDEPENDS_${PN} += "sqlite3" 21RDEPENDS:${PN} += "sqlite3"
22FILES_${PN} +="/usr/share" 22FILES:${PN} +="/usr/share"
23 23
24PARALLEL_MAKE = "-j 1" 24PARALLEL_MAKE = "-j 1"
25 25
@@ -35,13 +35,13 @@ EXTRA_OECONF = " \
35EXTRA_OEMAKE = "DESTDIR=${D}" 35EXTRA_OEMAKE = "DESTDIR=${D}"
36 36
37# This dev package contains an '.so' file used for JNI development 37# This dev package contains an '.so' file used for JNI development
38INSANE_SKIP_${PN}-dev = "dev-elf" 38INSANE_SKIP:${PN}-dev = "dev-elf"
39 39
40do_configure_append (){ 40do_configure:append (){
41 cp ${S}/*-libtool ${S}/libtool 41 cp ${S}/*-libtool ${S}/libtool
42} 42}
43 43
44do_compile_prepend (){ 44do_compile:prepend (){
45 echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc 45 echo '#!/bin/sh' > ${STAGING_BINDIR_NATIVE}/cc
46 echo '${BUILD_CC} $@' >> ${STAGING_BINDIR_NATIVE}/cc 46 echo '${BUILD_CC} $@' >> ${STAGING_BINDIR_NATIVE}/cc
47 chmod a+x ${STAGING_BINDIR_NATIVE}/cc 47 chmod a+x ${STAGING_BINDIR_NATIVE}/cc
diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb
index 1d4b96b..a0f70d8 100644
--- a/recipes-core/jcraft/jsch_0.1.40.bb
+++ b/recipes-core/jcraft/jsch_0.1.40.bb
@@ -9,8 +9,8 @@ inherit java-library
9 9
10DEPENDS = "jzlib" 10DEPENDS = "jzlib"
11 11
12RDEPENDS_${PN} = "libjzlib-java" 12RDEPENDS:${PN} = "libjzlib-java"
13RDEPENDS_${PN}_class-native = "" 13RDEPENDS:${PN}:class-native = ""
14 14
15do_compile() { 15do_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 233005a..5e6e470 100644
--- a/recipes-core/jikes/jikes_1.22.bb
+++ b/recipes-core/jikes/jikes_1.22.bb
@@ -13,14 +13,14 @@ inherit autotools update-alternatives relative_symlinks
13 13
14BBCLASSEXTEND = "native" 14BBCLASSEXTEND = "native"
15 15
16RDEPENDS_${PN} = "classpath" 16RDEPENDS:${PN} = "classpath"
17PROVIDES_class-native = "" 17PROVIDES:class-native = ""
18RDEPENDS_${PN}_class-native = "" 18RDEPENDS:${PN}:class-native = ""
19 19
20EXTRA_OECONF = "--disable-fp-emulation --enable-source15" 20EXTRA_OECONF = "--disable-fp-emulation --enable-source15"
21 21
22# configure script incorrectly defines these when cross compiling for ARM 22# configure script incorrectly defines these when cross compiling for ARM
23CXXFLAGS_append_arm += "-UHAVE_64BIT_TYPES -DWORDS_BIGENDIAN=1" 23CXXFLAGS:append:arm += "-UHAVE_64BIT_TYPES -DWORDS_BIGENDIAN=1"
24 24
25do_install() { 25do_install() {
26 oe_runmake 'DESTDIR=${D}' install 26 oe_runmake 'DESTDIR=${D}' install
@@ -28,7 +28,7 @@ do_install() {
28} 28}
29 29
30PROVIDES = "virtual/javac" 30PROVIDES = "virtual/javac"
31ALTERNATIVE_${PN} = "javac" 31ALTERNATIVE:${PN} = "javac"
32ALTERNATIVE_LINK = "/usr/bin/javac" 32ALTERNATIVE_LINK = "/usr/bin/javac"
33ALTERNATIVE_TARGET = "${bindir}/javac.jikes" 33ALTERNATIVE_TARGET = "${bindir}/javac.jikes"
34 34
diff --git a/recipes-core/jlex/jlex_1.2.6.bb b/recipes-core/jlex/jlex_1.2.6.bb
index 3c14e4c..48ec357 100644
--- a/recipes-core/jlex/jlex_1.2.6.bb
+++ b/recipes-core/jlex/jlex_1.2.6.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${JLEX_MAIN_FILENAME};beginline=148;endline=166;md5=9
7 7
8PACKAGE_ARCH = "${TUNE_PKGARCH}" 8PACKAGE_ARCH = "${TUNE_PKGARCH}"
9 9
10RDEPENDS_${PN} = "java2-runtime" 10RDEPENDS:${PN} = "java2-runtime"
11RDEPENDS_${PN}_class-native = "" 11RDEPENDS:${PN}:class-native = ""
12 12
13inherit java-library 13inherit java-library
14 14
@@ -35,14 +35,14 @@ do_compile() {
35 fastjar cf ${BP}.jar -C build . 35 fastjar cf ${BP}.jar -C build .
36} 36}
37 37
38do_install_append() { 38do_install:append() {
39 install -d ${D}${bindir} 39 install -d ${D}${bindir}
40 install -m 0755 jlex ${D}${bindir}/ 40 install -m 0755 jlex ${D}${bindir}/
41} 41}
42 42
43PACKAGES = "${PN}" 43PACKAGES = "${PN}"
44 44
45FILES_${PN} += "${datadir_java}" 45FILES:${PN} += "${datadir_java}"
46 46
47SRC_URI[md5sum] = "fe0cff5db3e2f0f5d67a153cf6c783af" 47SRC_URI[md5sum] = "fe0cff5db3e2f0f5d67a153cf6c783af"
48SRC_URI[sha256sum] = "aeebaece3b3a53972bb0ba0f810540386c267070ee9dca6ffa43c6ff74a54bd7" 48SRC_URI[sha256sum] = "aeebaece3b3a53972bb0ba0f810540386c267070ee9dca6ffa43c6ff74a54bd7"
diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb
index b366910..4f10575 100644
--- a/recipes-core/junit/junit_3.8.2.bb
+++ b/recipes-core/junit/junit_3.8.2.bb
@@ -16,14 +16,14 @@ inherit java-library
16do_unpackpost[dirs] = "${B}" 16do_unpackpost[dirs] = "${B}"
17do_unpackpost() { 17do_unpackpost() {
18 mkdir -p src 18 mkdir -p src
19 # Prevent deletion by do_removebinaries. 19 # Prevent deletion by do:removebinaries.
20 if [ -e src.jar ]; then 20 if [ -e src.jar ]; then
21 mv src.jar src.zip 21 mv src.jar src.zip
22 fi 22 fi
23 unzip -o src.zip -d src 23 unzip -o src.zip -d src
24} 24}
25 25
26addtask unpackpost before do_removebinaries after do_unpack 26addtask unpackpost before do:removebinaries after do_unpack
27 27
28do_compile() { 28do_compile() {
29 mkdir -p build 29 mkdir -p build
diff --git a/recipes-core/libmatthew/libmatthew.inc b/recipes-core/libmatthew/libmatthew.inc
index 2119c0b..b000387 100644
--- a/recipes-core/libmatthew/libmatthew.inc
+++ b/recipes-core/libmatthew/libmatthew.inc
@@ -47,7 +47,7 @@ do_install() {
47 oe_libinstall -so libunix-java ${D}${libdir_jni} 47 oe_libinstall -so libunix-java ${D}${libdir_jni}
48} 48}
49 49
50do_install_append() { 50do_install:append() {
51 rm ${D}${datadir_java}/${PN}.jar 51 rm ${D}${datadir_java}/${PN}.jar
52} 52}
53PACKAGES = "\ 53PACKAGES = "\
@@ -56,17 +56,17 @@ PACKAGES = "\
56 ${PN}-io-java ${PN}-debug-java \ 56 ${PN}-io-java ${PN}-debug-java \
57" 57"
58 58
59FILES_libcgi-java = "${datadir_java}/cgi*.jar" 59FILES:libcgi-java = "${datadir_java}/cgi*.jar"
60FILES_libcgi-jni = "${libdir_jni}/libcgi-java.so" 60FILES:libcgi-jni = "${libdir_jni}/libcgi-java.so"
61FILES_libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so" 61FILES:libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so"
62RDEPENDS_libcgi-java = "libcgi-jni" 62RDEPENDS:libcgi-java = "libcgi-jni"
63 63
64FILES_libunixsocket-java = "${datadir_java}/unix*.jar" 64FILES:libunixsocket-java = "${datadir_java}/unix*.jar"
65FILES_libunixsocket-jni = "${libdir_jni}/libunix-java.so" 65FILES:libunixsocket-jni = "${libdir_jni}/libunix-java.so"
66FILES_libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so" 66FILES:libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so"
67RDEPENDS_libunixsocket-java = "libunixsocket-jni" 67RDEPENDS:libunixsocket-java = "libunixsocket-jni"
68 68
69FILES_${PN}-io-java = "${datadir_java}/io*.jar" 69FILES:${PN}-io-java = "${datadir_java}/io*.jar"
70 70
71FILES_${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar" 71FILES:${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar"
72 72
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index c87266d..61b62b9 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -8,13 +8,13 @@ ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),
8 8
9S = "${WORKDIR}/${ICEDTEA}" 9S = "${WORKDIR}/${ICEDTEA}"
10 10
11DEPENDS_append_libc-uclibc = " virtual/libiconv " 11DEPENDS:append_libc-uclibc = " virtual/libiconv "
12 12
13# The OpenJDK build with interpreter optimizations for ARM depends on a binary 13# The OpenJDK build with interpreter optimizations for ARM depends on a binary
14# that generates constants for an assembler source file. There is no other 14# that generates constants for an assembler source file. There is no other
15# way than to generate this on a pseudo machine. Cross-compiling would not help 15# way than to generate this on a pseudo machine. Cross-compiling would not help
16# because structure sizes and/or alignment may differ. 16# because structure sizes and/or alignment may differ.
17DEPENDS_append = " qemu-native " 17DEPENDS:append = " qemu-native "
18 18
19B = "${S}/build" 19B = "${S}/build"
20 20
@@ -138,14 +138,14 @@ EXTRA_OECONF += " \
138 --disable-system-sctp \ 138 --disable-system-sctp \
139" 139"
140 140
141do_configure_prepend() { 141do_configure:prepend() {
142 # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with 142 # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with
143 # ".patch" into the patches directory. 143 # ".patch" into the patches directory.
144 find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; 144 find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \;
145 find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; 145 find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \;
146} 146}
147 147
148do_configure_append() { 148do_configure:append() {
149 oe_runmake patch 149 oe_runmake patch
150} 150}
151 151
@@ -168,7 +168,7 @@ EXTRA_OEMAKE += ' \
168 168
169OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}" 169OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,${libdir}/llvm${WANT_LLVM_RELEASE}"
170 170
171OE_LAUNCHER_LDFLAGS_arm = "" 171OE_LAUNCHER_LDFLAGS:arm = ""
172 172
173EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' 173EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"'
174 174
@@ -229,7 +229,7 @@ PACKAGES = " \
229 ${JDKPN}-common \ 229 ${JDKPN}-common \
230" 230"
231 231
232FILES_${JDKPN}-dbg = "\ 232FILES:${JDKPN}-dbg = "\
233 ${JDK_HOME}/bin/.debug \ 233 ${JDK_HOME}/bin/.debug \
234 ${JDK_HOME}/lib/.debug \ 234 ${JDK_HOME}/lib/.debug \
235 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ 235 ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \
@@ -244,9 +244,9 @@ FILES_${JDKPN}-dbg = "\
244 ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \ 244 ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \
245" 245"
246 246
247FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" 247FILES:${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample"
248RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" 248RDEPENDS:${JDKPN}-demo = "${JDKPN}-jre"
249FILES_${JDKPN}-demo-dbg = "\ 249FILES:${JDKPN}-demo-dbg = "\
250 ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ 250 ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \
251 ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ 251 ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \
252 ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ 252 ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \
@@ -258,13 +258,13 @@ FILES_${JDKPN}-demo-dbg = "\
258 ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ 258 ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \
259" 259"
260 260
261FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" 261FILES:${JDKPN}-source = "${JDK_HOME}/src.zip"
262 262
263FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" 263FILES:${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
264 264
265FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" 265FILES:${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
266 266
267FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ 267FILES:${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
268 ${JDK_HOME}/jre/THIRD_PARTY_README \ 268 ${JDK_HOME}/jre/THIRD_PARTY_README \
269 ${JDK_HOME}/jre/LICENSE \ 269 ${JDK_HOME}/jre/LICENSE \
270 ${JDK_HOME}/ASSEMBLY_EXCEPTION \ 270 ${JDK_HOME}/ASSEMBLY_EXCEPTION \
@@ -274,7 +274,7 @@ FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
274 ${JDK_HOME}/jre/lib \ 274 ${JDK_HOME}/jre/lib \
275" 275"
276 276
277FILES_${PN}_append = " \ 277FILES:${PN}:append = " \
278 ${JDK_HOME}/jre/bin/keytool \ 278 ${JDK_HOME}/jre/bin/keytool \
279 ${JDK_HOME}/jre/bin/orbd \ 279 ${JDK_HOME}/jre/bin/orbd \
280 ${JDK_HOME}/jre/bin/pack200 \ 280 ${JDK_HOME}/jre/bin/pack200 \
@@ -287,9 +287,9 @@ FILES_${PN}_append = " \
287 ${JDK_HOME}/jre/bin/javaws \ 287 ${JDK_HOME}/jre/bin/javaws \
288" 288"
289 289
290RDEPENDS_${JDKPN}-common = "librhino-java" 290RDEPENDS:${JDKPN}-common = "librhino-java"
291 291
292RPROVIDES_${JDKPN}-vm-zero = "java2-vm" 292RPROVIDES:${JDKPN}-vm-zero = "java2-vm"
293 293
294# Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: 294# Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled:
295# root@beaglebone:~/java# opkg remove openjdk-7-vm-shark 295# root@beaglebone:~/java# opkg remove openjdk-7-vm-shark
@@ -298,39 +298,39 @@ RPROVIDES_${JDKPN}-vm-zero = "java2-vm"
298# * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages: 298# * print_dependents_warning: Package openjdk-7-vm-shark is depended upon by packages:
299# * print_dependents_warning: openjdk-7-java 299# * print_dependents_warning: openjdk-7-java
300# * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed. 300# * print_dependents_warning: These might cease to work if package openjdk-7-vm-shark is removed.
301RRECOMMENDS_${JDKPN}-java = "java2-vm" 301RRECOMMENDS:${JDKPN}-java = "java2-vm"
302 302
303# For some reason shark and cacao do not automatically depends on -common. 303# For some reason shark and cacao do not automatically depends on -common.
304# So we add that manually. 304# So we add that manually.
305 305
306# There is a symlink to a .so but this one is valid. 306# There is a symlink to a .so but this one is valid.
307INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" 307INSANE_SKIP:${JDKPN}-vm-zero = "dev-so"
308INSANE_SKIP_${JDKPN}-common = "dev-so" 308INSANE_SKIP:${JDKPN}-common = "dev-so"
309 309
310# libfreetype.so.6 is copied from STAGING_LIBDIR 310# libfreetype.so.6 is copied from STAGING_LIBDIR
311# which is already stripped. 311# which is already stripped.
312INSANE_SKIP_${JDKPN}-jre = "already-stripped" 312INSANE_SKIP:${JDKPN}-jre = "already-stripped"
313 313
314FILES_${JDKPN}-jdk = " \ 314FILES:${JDKPN}-jdk = " \
315 ${JDK_HOME}/bin \ 315 ${JDK_HOME}/bin \
316 ${JDK_HOME}/lib \ 316 ${JDK_HOME}/lib \
317 ${JDK_HOME}/include \ 317 ${JDK_HOME}/include \
318 ${JDK_HOME}${libdir}/jvm \ 318 ${JDK_HOME}${libdir}/jvm \
319" 319"
320RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common" 320RDEPENDS:${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common"
321RDEPENDS_${JDKPN}-java = "${JDKPN}-common" 321RDEPENDS:${JDKPN}-java = "${JDKPN}-common"
322RPROVIDES_${JDKPN}-jre = "java2-runtime" 322RPROVIDES:${JDKPN}-jre = "java2-runtime"
323 323
324RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" 324RDEPENDS:${JDKPN}-jdk = "${JDKPN}-jre"
325 325
326FILES_${JDKPN}-doc = "${JDK_HOME}/man" 326FILES:${JDKPN}-doc = "${JDK_HOME}/man"
327 327
328# Name of the directory containing the compiled output 328# Name of the directory containing the compiled output
329BUILD_DIR = "openjdk.build" 329BUILD_DIR = "openjdk.build"
330BUILD_DIR_ECJ = "openjdk.build-ecj" 330BUILD_DIR_ECJ = "openjdk.build-ecj"
331 331
332# Force arm mode for now 332# Force arm mode for now
333ARM_INSTRUCTION_SET_armv4t = "ARM" 333ARM_INSTRUCTION_SET:armv4t = "ARM"
334 334
335ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" 335ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced"
336 336
@@ -361,7 +361,7 @@ LANGTOOLS_URI = "${ICEDTEA_DROP_URL}/${LANGTOOLS_FILE};name=langtools;unpack=fal
361# handles all postinst action for openjdk 361# handles all postinst action for openjdk
362# some of the former results in a build error because "ERR" is in the first line. 362# some of the former results in a build error because "ERR" is in the first line.
363 363
364pkg_postinst_ontarget_${JDKPN}-vm-shark () { 364pkg_postinst_ontarget:${JDKPN}-vm-shark () {
365 true 365 true
366 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 366 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
367 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 367 sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
@@ -370,7 +370,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-shark () {
370 fi 370 fi
371} 371}
372 372
373pkg_prerm_${JDKPN}-vm-shark () { 373pkg_prerm:${JDKPN}-vm-shark () {
374 true 374 true
375 sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 375 sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
376 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 376 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
@@ -381,7 +381,7 @@ pkg_prerm_${JDKPN}-vm-shark () {
381 echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 381 echo "-shark ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
382} 382}
383 383
384pkg_postinst_ontarget_${JDKPN}-vm-cacao () { 384pkg_postinst_ontarget:${JDKPN}-vm-cacao () {
385 true 385 true
386 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 386 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
387 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 387 sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
@@ -390,7 +390,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-cacao () {
390 fi 390 fi
391} 391}
392 392
393pkg_prerm_${JDKPN}-vm-cacao () { 393pkg_prerm:${JDKPN}-vm-cacao () {
394 true 394 true
395 sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 395 sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
396 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 396 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
@@ -401,7 +401,7 @@ pkg_prerm_${JDKPN}-vm-cacao () {
401 echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 401 echo "-cacao ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
402} 402}
403 403
404pkg_postinst_ontarget_${JDKPN}-vm-jamvm () { 404pkg_postinst_ontarget:${JDKPN}-vm-jamvm () {
405 true 405 true
406 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 406 if grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
407 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 407 sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
@@ -410,7 +410,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-jamvm () {
410 fi 410 fi
411} 411}
412 412
413pkg_prerm_${JDKPN}-vm-jamvm () { 413pkg_prerm:${JDKPN}-vm-jamvm () {
414 true 414 true
415 sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 415 sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
416 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 416 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
@@ -421,7 +421,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () {
421 echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 421 echo "-jamvm ERROR" >> ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
422} 422}
423 423
424pkg_postinst_ontarget_${JDKPN}-vm-zero () { 424pkg_postinst_ontarget:${JDKPN}-vm-zero () {
425 true 425 true
426 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 426 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
427 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1` 427 FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
@@ -432,7 +432,7 @@ pkg_postinst_ontarget_${JDKPN}-vm-zero () {
432 sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 432 sed -i -e "s|^\-server.*|\-server KNOWN|" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
433} 433}
434 434
435pkg_prerm_${JDKPN}-vm-zero () { 435pkg_prerm:${JDKPN}-vm-zero () {
436 true 436 true
437 sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg 437 sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
438 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then 438 if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
@@ -441,14 +441,14 @@ pkg_prerm_${JDKPN}-vm-zero () {
441 fi 441 fi
442} 442}
443 443
444pkg_postinst_${JDKPN}-jre () { 444pkg_postinst:${JDKPN}-jre () {
445 ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre 445 ln -s ${JDK_HOME}/jre $D/${libdir}/jvm/jre
446} 446}
447 447
448inherit update-alternatives 448inherit update-alternatives
449 449
450ALTERNATIVE_${JDKPN}-jre = "java keytool" 450ALTERNATIVE:${JDKPN}-jre = "java keytool"
451ALTERNATIVE_${JDKPN}-jdk = "javac" 451ALTERNATIVE:${JDKPN}-jdk = "javac"
452 452
453ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java" 453ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java"
454ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" 454ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac"
diff --git a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
index d774cc2..57827d9 100644
--- a/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
+++ b/recipes-core/openjdk/openjdk-7_99b00-2.6.5.bb
@@ -80,4 +80,4 @@ export DISTRIBUTION_PATCHES
80# to avoid this error add -fpermissive 80# to avoid this error add -fpermissive
81# 81#
82# NOTE: When updating the recipe, please check if this is still needed 82# NOTE: When updating the recipe, please check if this is still needed
83CFLAGS_append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive" 83CFLAGS:append = " -Wno-error=deprecated-declarations -Wno-error=narrowing -fpermissive"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 7d45585..16e3816 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -26,7 +26,7 @@ SRC_URI = "\
26 ${PATCHES_URI} \ 26 ${PATCHES_URI} \
27" 27"
28 28
29do_configure_prepend () { 29do_configure:prepend () {
30 export TOPDIR=${S} 30 export TOPDIR=${S}
31 sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac 31 sed -i 's#\$TOPDIR#${S}#g' ${S}/common/autoconf/configure.ac
32} 32}
@@ -43,8 +43,8 @@ do_unpack_extract_submodules () {
43 tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g" 43 tar xjf ${WORKDIR}/${NASHORN_FILE_LOCAL} --transform "s,-${NASHORN_CHANGESET},,g"
44} 44}
45 45
46do_patch_prepend() { 46do_patch:prepend() {
47 # use do_patch_prepend syntax and not pre/postfuncs to 47 # use do_patch:prepend syntax and not pre/postfuncs to
48 # call do_unpack_extract_submodules 48 # call do_unpack_extract_submodules
49 # *) the archiver.bbclass modifies WORKDIR, S, B,... 49 # *) the archiver.bbclass modifies WORKDIR, S, B,...
50 # and those modifications are lost otherwise, 50 # and those modifications are lost otherwise,
@@ -177,7 +177,7 @@ ALTERNATIVE_PRIORITY = "50"
177 177
178OPENJDK_UPDATE_VERSION = "${PV}" 178OPENJDK_UPDATE_VERSION = "${PV}"
179OPENJDK_BUILD_NUMBER = "ga" 179OPENJDK_BUILD_NUMBER = "ga"
180EXTRA_OECONF_append = "\ 180EXTRA_OECONF:append = "\
181 --with-build-number=${OPENJDK_BUILD_NUMBER} \ 181 --with-build-number=${OPENJDK_BUILD_NUMBER} \
182 --with-update-version=${OPENJDK_UPDATE_VERSION} \ 182 --with-update-version=${OPENJDK_UPDATE_VERSION} \
183" 183"
@@ -189,8 +189,8 @@ EXTRA_OECONF_append = "\
189GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon" 189GLOBAL_FLAGS = "-fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon"
190 190
191# flags for -native, and for bits that need a host-tool during -cross 191# flags for -native, and for bits that need a host-tool during -cross
192BUILD_CFLAGS_append = " ${GLOBAL_FLAGS}" 192BUILD_CFLAGS:append = " ${GLOBAL_FLAGS}"
193BUILD_CXXFLAGS_append = " ${GLOBAL_FLAGS}" 193BUILD_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
194# flags for -cross 194# flags for -cross
195TARGET_CFLAGS_append = " ${GLOBAL_FLAGS}" 195TARGET_CFLAGS:append = " ${GLOBAL_FLAGS}"
196TARGET_CXXFLAGS_append = " ${GLOBAL_FLAGS}" 196TARGET_CXXFLAGS:append = " ${GLOBAL_FLAGS}"
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc
index 25d971f..ff682f1 100644
--- a/recipes-core/openjdk/openjdk-8-cross.inc
+++ b/recipes-core/openjdk/openjdk-8-cross.inc
@@ -47,13 +47,13 @@ require openjdk-8-common.inc
47 47
48JAVA_HOME[unexport] = "1" 48JAVA_HOME[unexport] = "1"
49 49
50SRC_URI_append = "\ 50SRC_URI:append = "\
51 file://jvm.cfg \ 51 file://jvm.cfg \
52 file://0011-autoconf-fix-CC-with-arguments-detection.patch \ 52 file://0011-autoconf-fix-CC-with-arguments-detection.patch \
53 file://0012-autoconf-NativeCompilation-remove-sysroot.patch \ 53 file://0012-autoconf-NativeCompilation-remove-sysroot.patch \
54" 54"
55 55
56EXTRA_OECONF_append = "\ 56EXTRA_OECONF:append = "\
57 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 57 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
58 \ 58 \
59 --with-tools-dir=${STAGING_DIR_NATIVE} \ 59 --with-tools-dir=${STAGING_DIR_NATIVE} \
@@ -73,16 +73,16 @@ EXTRA_OECONF_append = "\
73 ${@jdk_configure_options(d)} \ 73 ${@jdk_configure_options(d)} \
74" 74"
75 75
76do_configure_prepend() { 76do_configure:prepend() {
77 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 77 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
78 export ${@jdk_environment_options(d)} 78 export ${@jdk_environment_options(d)}
79} 79}
80 80
81do_configure_append() { 81do_configure:append() {
82 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk 82 sed -i -e 's,POST_STRIP_CMD:=.*,POST_STRIP_CMD:=,g' ${B}/spec.gmk
83} 83}
84 84
85do_install_append() { 85do_install:append() {
86 if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then 86 if ${@bb.utils.contains('PACKAGECONFIG', 'repack', 'true', 'false', d)} ; then
87 if [ -d ${D}${JDK_HOME} ] ; then 87 if [ -d ${D}${JDK_HOME} ] ; then
88 find ${D}${JDK_HOME} -name "*.jar" -print0 | \ 88 find ${D}${JDK_HOME} -name "*.jar" -print0 | \
@@ -104,7 +104,7 @@ do_install[vardepsexclude] += "BB_NUMBER_THREADS"
104export MAKE_VERBOSE = "y" 104export MAKE_VERBOSE = "y"
105export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip" 105export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace STRIP_POLICY=no_strip"
106 106
107EXTRA_OEMAKE_append = '\ 107EXTRA_OEMAKE:append = '\
108 ${@jdk_make_options(d)} \ 108 ${@jdk_make_options(d)} \
109 ALT_SDT_H="${STAGING_INCDIR}" \ 109 ALT_SDT_H="${STAGING_INCDIR}" \
110 ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \ 110 ALT_CUPS_HEADERS_PATH="${STAGING_INCDIR}" \
@@ -132,4 +132,4 @@ PACKAGE_PREPROCESS_FUNCS += "remove_debuglink"
132 132
133# FIXME libjsig.so is a symlink to a .so but this one is valid 133# FIXME libjsig.so is a symlink to a .so but this one is valid
134# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped 134# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
135INSANE_SKIP_${PN} = "dev-so already-stripped" 135INSANE_SKIP:${PN} = "dev-so already-stripped"
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index 3282257..c02e183 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -17,7 +17,7 @@ PACKAGECONFIG[jpeg] = "--with-libjpeg=system,--with-libjpeg=bundled,jpeg-native"
17PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native" 17PACKAGECONFIG[png] = "--with-libpng=system,--with-libpng=bundled,libpng-native"
18PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native" 18PACKAGECONFIG[zlib] = "--with-zlib=system,--with-zlib=bundled,zlib-native"
19 19
20EXTRA_OECONF_append = "\ 20EXTRA_OECONF:append = "\
21 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \ 21 --with-jobs=${@openjdk_build_helper_get_parallel_make(d)} \
22 \ 22 \
23 --with-tools-dir=${STAGING_DIR_NATIVE} \ 23 --with-tools-dir=${STAGING_DIR_NATIVE} \
@@ -36,32 +36,32 @@ require openjdk-8-common.inc
36 36
37inherit native 37inherit native
38 38
39CFLAGS_append = " ${@jdk_cpp_options(d)}" 39CFLAGS:append = " ${@jdk_cpp_options(d)}"
40CPPFLAGS_append = "${@jdk_cpp_options(d)}" 40CPPFLAGS:append = "${@jdk_cpp_options(d)}"
41CXXFLAGS_append = " ${@jdk_cpp_options(d)}" 41CXXFLAGS:append = " ${@jdk_cpp_options(d)}"
42 42
43export MAKE_VERBOSE = "y" 43export MAKE_VERBOSE = "y"
44export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace" 44export MFLAGS="${@jdk_make_options(d)} MAKE_VERBOSE=y QUIETLY= VERBOSE=-s LOG_LEVEL=trace"
45 45
46EXTRA_OEMAKE_append = ' \ 46EXTRA_OEMAKE:append = ' \
47 ${@jdk_make_options(d)} \ 47 ${@jdk_make_options(d)} \
48 MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \ 48 MAKE_VERBOSE=y VERBOSE=-s LOG_LEVEL=trace \
49 QUIETLY= \ 49 QUIETLY= \
50 images \ 50 images \
51' 51'
52 52
53do_configure_prepend() { 53do_configure:prepend() {
54 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 54 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
55 export ${@jdk_environment_options(d)} 55 export ${@jdk_environment_options(d)}
56 unset CC CXX 56 unset CC CXX
57} 57}
58 58
59do_compile_prepend() { 59do_compile:prepend() {
60 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}" 60 export JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS}"
61 rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts" 61 rm -f "${B}/images/j2sdk-image/jre/lib/security/cacerts"
62} 62}
63 63
64do_compile_append() { 64do_compile:append() {
65 set -x 65 set -x
66 mkdir -p ${B}/certs 66 mkdir -p ${B}/certs
67 for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt") 67 for pem in $(find ${STAGING_DATADIR}/ca-certificates -name "*.crt")
@@ -90,4 +90,4 @@ do_install() {
90} 90}
91 91
92# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped 92# FIXME libfreetype.so.6 is copied from STAGING_LIBDIR which is already stripped
93INSANE_SKIP_${PN} = "already-stripped" 93INSANE_SKIP:${PN} = "already-stripped"
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch32.inc b/recipes-core/openjdk/openjdk-8-release-aarch32.inc
index 700a0f5..17e3a3d 100644
--- a/recipes-core/openjdk/openjdk-8-release-aarch32.inc
+++ b/recipes-core/openjdk/openjdk-8-release-aarch32.inc
@@ -1,39 +1,39 @@
1require openjdk-8-release-common.inc 1require openjdk-8-release-common.inc
2 2
3COMPATIBLE_HOST = "^$" 3COMPATIBLE_HOST = "^$"
4COMPATIBLE_HOST_armv7a = "arm" 4COMPATIBLE_HOST:armv7a = "arm"
5COMPATIBLE_HOST_armv7ve = "arm" 5COMPATIBLE_HOST:armv7ve = "arm"
6 6
7CHANGESET_ID="b09-aarch32-20200929" 7CHANGESET_ID="b09-aarch32-20200929"
8 8
9CORBA_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 9CORBA_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
10SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741" 10SRC_URI[corba.sha256sum] = "3675f043479c7e3ee7128651527d15c4e56f72d22dd953b8d0d8e5c9a2c68741"
11 11
12HOTSPOT_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 12HOTSPOT_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
13SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81" 13SRC_URI[hotspot.sha256sum] = "d5ea125d7e54fd3dd21bf1654c09b5ce17497d9327f770abd56ad1108a337b81"
14 14
15JAXP_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 15JAXP_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
16SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e" 16SRC_URI[jaxp.sha256sum] = "a025f9f047bc50947aa631641b2f836c3a3ec4a5f2c9019bc7b11ab8444f7b9e"
17 17
18JAXWS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 18JAXWS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
19SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f" 19SRC_URI[jaxws.sha256sum] = "ad921e0f5cafab4c5b4bb248ea59bf1615864c4de17bfd7321759d063398dc3f"
20 20
21JDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 21JDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
22SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe" 22SRC_URI[jdk.sha256sum] = "835e81fc88b8c0e40df0d89be5d8a852638b3f5f29acad6997cbc36a2e8341fe"
23 23
24LANGTOOLS_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 24LANGTOOLS_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
25SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f" 25SRC_URI[langtools.sha256sum] = "554491026bb9fadb837d635d4beea3ca9cb73f034c1379d57fcd77787816139f"
26 26
27NASHORN_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 27NASHORN_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
28SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223" 28SRC_URI[nashorn.sha256sum] = "8358000a7e52fcfd046027319569d17f2e99b710acbfd1a1120b50ce93afe223"
29 29
30OPENJDK_CHANGESET_arm = "jdk8u${PV}-${CHANGESET_ID}" 30OPENJDK_CHANGESET:arm = "jdk8u${PV}-${CHANGESET_ID}"
31SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a" 31SRC_URI[openjdk.sha256sum] = "4b38e672c82df5d18215849829a80a111b1c7b46567bc641e9fec92bedd0d32a"
32 32
33PACKAGECONFIG_append_armv7a = " client" 33PACKAGECONFIG:append:armv7a = " client"
34PACKAGECONFIG_append_armv7ve = " client" 34PACKAGECONFIG:append:armv7ve = " client"
35 35
36do_install_append() { 36do_install:append() {
37 if [ -d ${D}${JDK_HOME} ] ; then 37 if [ -d ${D}${JDK_HOME} ] ; then
38 sed -e 's,^\(-server ERROR$\),# \1,' \ 38 sed -e 's,^\(-server ERROR$\),# \1,' \
39 -e 's,^-client IGNORE,-client ERROR,' \ 39 -e 's,^-client IGNORE,-client ERROR,' \
@@ -48,5 +48,5 @@ do_install_append() {
48 fi 48 fi
49} 49}
50 50
51JDK_ARCH_armv7a = "aarch32" 51JDK_ARCH:armv7a = "aarch32"
52JDK_ARCH_armv7ve = "aarch32" 52JDK_ARCH:armv7ve = "aarch32"
diff --git a/recipes-core/openjdk/openjdk-8-release-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-aarch64.inc
index c71dd25..3aac110 100644
--- a/recipes-core/openjdk/openjdk-8-release-aarch64.inc
+++ b/recipes-core/openjdk/openjdk-8-release-aarch64.inc
@@ -4,26 +4,26 @@ COMPATIBLE_HOST = "aarch64"
4 4
5CHANGESET_ID="b10" 5CHANGESET_ID="b10"
6 6
7CORBA_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 7CORBA_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
8SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae" 8SRC_URI[corba.sha256sum] = "112143d935a94cb95a0f9dba19a86184d08e699a68a82db58cdd9f0de1baeeae"
9 9
10HOTSPOT_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 10HOTSPOT_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
11SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274" 11SRC_URI[hotspot.sha256sum] = "16ed30b46279e2ffef04ab392502e32525451bea38f3af0d3c3782bcd33a0274"
12 12
13JAXP_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 13JAXP_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
14SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987" 14SRC_URI[jaxp.sha256sum] = "5dde165d7327b08f2ebc8d3081a1734d9ef737117dcaa417eb7dc39344220987"
15 15
16JAXWS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 16JAXWS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
17SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf" 17SRC_URI[jaxws.sha256sum] = "cedde28264a85cb16ae46123091edb64f7c1d2cd5f3de6ba0d21cffff84c3ccf"
18 18
19JDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 19JDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
20SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93" 20SRC_URI[jdk.sha256sum] = "7e53438e0506536fe373b7f8176512c701b87adda268831d180ead2695154a93"
21 21
22LANGTOOLS_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 22LANGTOOLS_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
23SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a" 23SRC_URI[langtools.sha256sum] = "8dbcd45109d0c782a6cac5a1a310a5816d4dac8a9c095635832ab803bfdb861a"
24 24
25NASHORN_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 25NASHORN_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
26SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387" 26SRC_URI[nashorn.sha256sum] = "85497cdba0943644d838862761891d0a06dfaad5ea13b63af69f1a6d595e6387"
27 27
28OPENJDK_CHANGESET_aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}" 28OPENJDK_CHANGESET:aarch64 = "aarch64-shenandoah-jdk8u${PV}-${CHANGESET_ID}"
29SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760" 29SRC_URI[openjdk.sha256sum] = "97175c78de4c82b78d3c80b1b0d22c44b195ca067f253cfaa3c235328b808760"
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index a3747cf..6c7bdd2 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -32,22 +32,22 @@ HOTSPOT_UB_PATCH = "\
32 file://1008-hotspot-handle-format-error-for-GCC-7.patch \ 32 file://1008-hotspot-handle-format-error-for-GCC-7.patch \
33 file://1012-hotspot-enable-Wno-error.patch \ 33 file://1012-hotspot-enable-Wno-error.patch \
34" 34"
35HOTSPOT_UB_PATCH_append_class-target = "\ 35HOTSPOT_UB_PATCH:append:class-target = "\
36 file://1009-hotspot-fix-adlc-flags.patch \ 36 file://1009-hotspot-fix-adlc-flags.patch \
37 file://1010-hotspot-fix-shark-build-common.patch \ 37 file://1010-hotspot-fix-shark-build-common.patch \
38 file://1011-hotspot-restrict-to-staging-dir.patch \ 38 file://1011-hotspot-restrict-to-staging-dir.patch \
39" 39"
40HOTSPOT_UB_PATCH_prepend_aarch64 = "\ 40HOTSPOT_UB_PATCH:prepend:aarch64 = "\
41 file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \ 41 file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \
42" 42"
43HOTSPOT_UB_PATCH_append_armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" 43HOTSPOT_UB_PATCH:append:armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch"
44HOTSPOT_UB_PATCH_append_armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch" 44HOTSPOT_UB_PATCH:append:armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch"
45 45
46PATCHES_URI_append_class-target = "\ 46PATCHES_URI:append:class-target = "\
47 file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \ 47 file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \
48" 48"
49 49
50PATCHES_URI_append_libc-musl = "\ 50PATCHES_URI:append:libc-musl = "\
51 ${OBSOLETE_ISNANF_PATCH} \ 51 ${OBSOLETE_ISNANF_PATCH} \
52 file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ 52 file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \
53 file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ 53 file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \
@@ -56,50 +56,50 @@ PATCHES_URI_append_libc-musl = "\
56 ${DISABLE_AGENT_BUILD_PT2} \ 56 ${DISABLE_AGENT_BUILD_PT2} \
57 file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ 57 file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \
58 ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ 58 ${REMOVE_GLIBC_DEPENDENCIES_PT2} \
59 file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ 59 file://musl-0007-hotspot-os_linux:x86-remove-glibc-dependencies-fpu_c.patch \
60 file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ 60 file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \
61 file://musl-0009-jdk-musl-has-gethostby_r.patch \ 61 file://musl-0009-jdk-musl-has-gethostby_r.patch \
62" 62"
63OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" 63OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch"
64OBSOLETE_ISNANF_PATCH_armv7a = "" 64OBSOLETE_ISNANF_PATCH:armv7a = ""
65OBSOLETE_ISNANF_PATCH_armv7ve = "" 65OBSOLETE_ISNANF_PATCH:armv7ve = ""
66DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" 66DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch"
67DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" 67DISABLE_AGENT_BUILD_PT2:armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
68DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" 68DISABLE_AGENT_BUILD_PT2:armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
69REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" 69REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch"
70REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" 70REMOVE_GLIBC_DEPENDENCIES_PT2:armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
71REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" 71REMOVE_GLIBC_DEPENDENCIES_PT2:armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
72 72
73PATCHES_URI_append_libc-musl_armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" 73PATCHES_URI:append:libc-musl:armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch"
74PATCHES_URI_append_libc-musl_armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch" 74PATCHES_URI:append:libc-musl:armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch"
75PATCHES_URI_append_libc-musl_aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch" 75PATCHES_URI:append:libc-musl:aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch"
76 76
77# remove aarch32 & aarch64 mainlined patches 77# remove aarch32 & aarch64 mainlined patches
78PATCHES_URI_remove_armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" 78PATCHES_URI:remove:armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch"
79PATCHES_URI_remove_armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" 79PATCHES_URI:remove:armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch"
80PATCHES_URI_remove_aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch" 80PATCHES_URI:remove:aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch"
81 81
82# Name of the directory containing the compiled output 82# Name of the directory containing the compiled output
83BUILD_DIR = "openjdk.build" 83BUILD_DIR = "openjdk.build"
84BUILD_DIR_ECJ = "openjdk.build-ecj" 84BUILD_DIR_ECJ = "openjdk.build-ecj"
85 85
86# Force arm mode for now 86# Force arm mode for now
87ARM_INSTRUCTION_SET_armv4t = "ARM" 87ARM_INSTRUCTION_SET:armv4t = "ARM"
88 88
89# Enable zero mode for arm based builds, as normal hotspot fails to build 89# Enable zero mode for arm based builds, as normal hotspot fails to build
90PACKAGECONFIG_append_armv4 = " zero" 90PACKAGECONFIG:append:armv4 = " zero"
91PACKAGECONFIG_append_armv5 = " zero" 91PACKAGECONFIG:append:armv5 = " zero"
92PACKAGECONFIG_append_armv6 = " zero" 92PACKAGECONFIG:append:armv6 = " zero"
93 93
94OPENJDK_ARCH_PORT = "jdk8u" 94OPENJDK_ARCH_PORT = "jdk8u"
95OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" 95OPENJDK_ARCH_PORT:aarch64 = "aarch64-port"
96OPENJDK_ARCH_PORT_armv7a = "aarch32-port" 96OPENJDK_ARCH_PORT:armv7a = "aarch32-port"
97OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" 97OPENJDK_ARCH_PORT:armv7ve = "aarch32-port"
98OPENJDK_HG_U = "jdk8u" 98OPENJDK_HG_U = "jdk8u"
99 99
100# the aarch64 port moved, for more information see: 100# the aarch64 port moved, for more information see:
101# https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html 101# https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html
102OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah" 102OPENJDK_HG_U:aarch64 = "jdk8u-shenandoah"
103 103
104OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" 104OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}"
105 105
diff --git a/recipes-core/openjdk/openjdk-8-release.inc b/recipes-core/openjdk/openjdk-8-release.inc
index 28429f8..4cdd050 100644
--- a/recipes-core/openjdk/openjdk-8-release.inc
+++ b/recipes-core/openjdk/openjdk-8-release.inc
@@ -3,8 +3,8 @@ require openjdk-8-release-common.inc
3# We do not yet work for aarch64, and we make sure 3# We do not yet work for aarch64, and we make sure
4# to use the aarch32 port for ARMv7. 4# to use the aarch32 port for ARMv7.
5COMPATIBLE_HOST = "^(?!(aarch64)).*$" 5COMPATIBLE_HOST = "^(?!(aarch64)).*$"
6COMPATIBLE_HOST_armv7a = "^$" 6COMPATIBLE_HOST:armv7a = "^$"
7COMPATIBLE_HOST_armv7ve = "^$" 7COMPATIBLE_HOST:armv7ve = "^$"
8 8
9CORBA_CHANGESET = "jdk8u${PV}-ga" 9CORBA_CHANGESET = "jdk8u${PV}-ga"
10SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138" 10SRC_URI[corba.sha256sum] = "28c487a49546ab1a592eaf229c13e1896b390958ac4e6fa19bf5da34a1977138"
diff --git a/recipes-core/openjdk/openjdk-8_272.bb b/recipes-core/openjdk/openjdk-8_272.bb
index f9049e5..0bfa102 100644
--- a/recipes-core/openjdk/openjdk-8_272.bb
+++ b/recipes-core/openjdk/openjdk-8_272.bb
@@ -1,7 +1,7 @@
1INC_FILE_SUFFIX = "" 1INC_FILE_SUFFIX = ""
2INC_FILE_SUFFIX_aarch64 = "-aarch64" 2INC_FILE_SUFFIX:aarch64 = "-aarch64"
3INC_FILE_SUFFIX_armv7a = "-aarch32" 3INC_FILE_SUFFIX:armv7a = "-aarch32"
4INC_FILE_SUFFIX_armv7ve = "-aarch32" 4INC_FILE_SUFFIX:armv7ve = "-aarch32"
5require openjdk-8-release${INC_FILE_SUFFIX}.inc 5require openjdk-8-release${INC_FILE_SUFFIX}.inc
6require openjdk-8-cross.inc 6require openjdk-8-cross.inc
7 7
@@ -14,12 +14,12 @@ do_install() {
14 find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \; 14 find ${D}${JDK_HOME} -name "*.debuginfo" -exec rm {} \;
15} 15}
16 16
17PACKAGES_append = " \ 17PACKAGES:append = " \
18 ${PN}-demo \ 18 ${PN}-demo \
19 ${PN}-source \ 19 ${PN}-source \
20" 20"
21 21
22FILES_${PN}_append = "\ 22FILES:${PN}:append = "\
23 ${JDK_HOME}/bin/[a-z]* \ 23 ${JDK_HOME}/bin/[a-z]* \
24 ${JDK_HOME}/lib/[a-z]* \ 24 ${JDK_HOME}/lib/[a-z]* \
25 ${JDK_HOME}/jre/bin/[a-z]* \ 25 ${JDK_HOME}/jre/bin/[a-z]* \
@@ -29,14 +29,14 @@ FILES_${PN}_append = "\
29 ${JDK_HOME}/release \ 29 ${JDK_HOME}/release \
30" 30"
31 31
32FILES_${PN}-dev_append = "\ 32FILES:${PN}-dev:append = "\
33 ${JDK_HOME}/include \ 33 ${JDK_HOME}/include \
34" 34"
35 35
36FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " 36FILES:${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample "
37RDEPENDS_${PN}-demo = " ${PN} " 37RDEPENDS:${PN}-demo = " ${PN} "
38 38
39FILES_${PN}-doc_append = "\ 39FILES:${PN}-doc:append = "\
40 ${JDK_HOME}/man \ 40 ${JDK_HOME}/man \
41 ${JDK_HOME}/ASSEMBLY_EXCEPTION \ 41 ${JDK_HOME}/ASSEMBLY_EXCEPTION \
42 ${JDK_HOME}/THIRD_PARTY_README \ 42 ${JDK_HOME}/THIRD_PARTY_README \
@@ -45,15 +45,15 @@ FILES_${PN}-doc_append = "\
45 ${JDK_HOME}/man \ 45 ${JDK_HOME}/man \
46" 46"
47 47
48FILES_${PN}-source = " ${JDK_HOME}/src.zip " 48FILES:${PN}-source = " ${JDK_HOME}/src.zip "
49 49
50RPROVIDES_${PN} = "java2-runtime" 50RPROVIDES:${PN} = "java2-runtime"
51 51
52inherit update-alternatives 52inherit update-alternatives
53 53
54ALTERNATIVE_PRIORITY = "100" 54ALTERNATIVE_PRIORITY = "100"
55 55
56ALTERNATIVE_${PN} = "java javac keytool" 56ALTERNATIVE:${PN} = "java javac keytool"
57ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" 57ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
58ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" 58ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java"
59 59
diff --git a/recipes-core/openjdk/openjre-8_272.bb b/recipes-core/openjdk/openjre-8_272.bb
index 55ca1ec..c1789aa 100644
--- a/recipes-core/openjdk/openjre-8_272.bb
+++ b/recipes-core/openjdk/openjre-8_272.bb
@@ -1,7 +1,7 @@
1INC_FILE_SUFFIX = "" 1INC_FILE_SUFFIX = ""
2INC_FILE_SUFFIX_aarch64 = "-aarch64" 2INC_FILE_SUFFIX:aarch64 = "-aarch64"
3INC_FILE_SUFFIX_armv7a = "-aarch32" 3INC_FILE_SUFFIX:armv7a = "-aarch32"
4INC_FILE_SUFFIX_armv7ve = "-aarch32" 4INC_FILE_SUFFIX:armv7ve = "-aarch32"
5require openjdk-8-release${INC_FILE_SUFFIX}.inc 5require openjdk-8-release${INC_FILE_SUFFIX}.inc
6require openjdk-8-cross.inc 6require openjdk-8-cross.inc
7 7
@@ -13,14 +13,14 @@ do_install() {
13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ 13 install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/
14} 14}
15 15
16FILES_${PN}_append = "\ 16FILES:${PN}:append = "\
17 ${JRE_HOME}/bin/[a-z]* \ 17 ${JRE_HOME}/bin/[a-z]* \
18 ${JRE_HOME}/lib/[a-z]* \ 18 ${JRE_HOME}/lib/[a-z]* \
19 ${JRE_HOME}/LICENSE \ 19 ${JRE_HOME}/LICENSE \
20 ${JRE_HOME}/release \ 20 ${JRE_HOME}/release \
21" 21"
22 22
23FILES_${PN}-dbg_append = "\ 23FILES:${PN}-dbg:append = "\
24 ${JRE_HOME}/bin/.debug/ \ 24 ${JRE_HOME}/bin/.debug/ \
25 ${JRE_HOME}/lib/.debug/ \ 25 ${JRE_HOME}/lib/.debug/ \
26 ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ 26 ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \
@@ -28,19 +28,19 @@ FILES_${PN}-dbg_append = "\
28 ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ 28 ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \
29" 29"
30 30
31FILES_${PN}-doc_append = "\ 31FILES:${PN}-doc:append = "\
32 ${JRE_HOME}/man \ 32 ${JRE_HOME}/man \
33 ${JRE_HOME}/ASSEMBLY_EXCEPTION \ 33 ${JRE_HOME}/ASSEMBLY_EXCEPTION \
34 ${JRE_HOME}/THIRD_PARTY_README \ 34 ${JRE_HOME}/THIRD_PARTY_README \
35" 35"
36 36
37RPROVIDES_${PN} = "java2-runtime" 37RPROVIDES:${PN} = "java2-runtime"
38 38
39inherit update-alternatives 39inherit update-alternatives
40 40
41ALTERNATIVE_PRIORITY = "100" 41ALTERNATIVE_PRIORITY = "100"
42 42
43ALTERNATIVE_${PN} = "java keytool" 43ALTERNATIVE:${PN} = "java keytool"
44ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" 44ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
45ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" 45ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java"
46 46
diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb
index 4242005..54329c1 100644
--- a/recipes-core/rhino/rhino_1.7r4.bb
+++ b/recipes-core/rhino/rhino_1.7r4.bb
@@ -2,7 +2,7 @@ SUMMARY = "Lexical analyzer generator for Java"
2LICENSE = "MPL-2.0" 2LICENSE = "MPL-2.0"
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8e2372bdbf22c99279ae4599a13cc458" 3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8e2372bdbf22c99279ae4599a13cc458"
4 4
5DEPENDS_class-native += "classpath-native" 5DEPENDS:class-native += "classpath-native"
6 6
7BBCLASSEXTEND = "native" 7BBCLASSEXTEND = "native"
8 8
@@ -20,9 +20,9 @@ S = "${WORKDIR}/rhino1_7R4"
20 20
21PACKAGES = "${JPN} rhino" 21PACKAGES = "${JPN} rhino"
22 22
23FILES_${PN} = "${bindir}/rhino ${bindir}/rhino-jsc" 23FILES:${PN} = "${bindir}/rhino ${bindir}/rhino-jsc"
24RDEPENDS_${PN} = "java2-runtime ${JPN}" 24RDEPENDS:${PN} = "java2-runtime ${JPN}"
25RDEPENDS_${PN}_class-native = "" 25RDEPENDS:${PN}:class-native = ""
26 26
27do_compile() { 27do_compile() {
28 mkdir -p build 28 mkdir -p build
@@ -39,7 +39,7 @@ do_compile() {
39 fastjar cfm ${JARFILENAME} ${S}/src/manifest -C build . 39 fastjar cfm ${JARFILENAME} ${S}/src/manifest -C build .
40} 40}
41 41
42do_install_append() { 42do_install:append() {
43 install -d ${D}${bindir} 43 install -d ${D}${bindir}
44 44
45 install -m 0755 ${WORKDIR}/rhino ${D}${bindir} 45 install -m 0755 ${WORKDIR}/rhino ${D}${bindir}
diff --git a/recipes-core/servlet-api/jsp2.0_5.5.26.bb b/recipes-core/servlet-api/jsp2.0_5.5.26.bb
index 286d6d5..ac8617c 100644
--- a/recipes-core/servlet-api/jsp2.0_5.5.26.bb
+++ b/recipes-core/servlet-api/jsp2.0_5.5.26.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/apache-tomcat-${PV}-src/servletapi/jsr152"
10inherit java-library 10inherit java-library
11 11
12DEPENDS = "servlet2.4" 12DEPENDS = "servlet2.4"
13RDEPENDS_${PN} = "libservlet2.4-java" 13RDEPENDS:${PN} = "libservlet2.4-java"
14 14
15# Value of implementation.revision in build.xml 15# Value of implementation.revision in build.xml
16IMPL_REVISION = "public_draft" 16IMPL_REVISION = "public_draft"
diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb
index ad985cb..138bc75 100644
--- a/recipes-core/xalan-j/xalan-j_2.7.1.bb
+++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb
@@ -47,14 +47,14 @@ do_compile() {
47 fastjar cf serializer-${PV}.jar -C build-serializer . 47 fastjar cf serializer-${PV}.jar -C build-serializer .
48} 48}
49 49
50do_install_append() { 50do_install:append() {
51 oe_jarinstall serializer-${PV}.jar serializer.jar 51 oe_jarinstall serializer-${PV}.jar serializer.jar
52} 52}
53 53
54 54
55PACKAGES = "libxalan2-serializer-java ${JPN}" 55PACKAGES = "libxalan2-serializer-java ${JPN}"
56 56
57FILES_libxalan2-serializer-java = "${datadir_java}/serializer*.jar" 57FILES:libxalan2-serializer-java = "${datadir_java}/serializer*.jar"
58 58
59SRC_URI[archive.md5sum] = "fc805051f0fe505c7a4b1b5c8db9b9e3" 59SRC_URI[archive.md5sum] = "fc805051f0fe505c7a4b1b5c8db9b9e3"
60SRC_URI[archive.sha256sum] = "fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043" 60SRC_URI[archive.sha256sum] = "fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043"
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 98ef32f..105a196 100644
--- a/recipes-core/xerces-j/xerces-j_2.11.0.bb
+++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb
@@ -22,8 +22,8 @@ JPN = "libxerces2-java"
22 22
23DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" 23DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1"
24 24
25RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" 25RDEPENDS:${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java"
26RDEPENDS_${PN}_class-native = "" 26RDEPENDS:${PN}:class-native = ""
27 27
28do_unpackpost[dirs] = "${B}" 28do_unpackpost[dirs] = "${B}"
29do_unpackpost() { 29do_unpackpost() {
diff --git a/recipes-core/xml-commons/jaxme_0.5.2.bb b/recipes-core/xml-commons/jaxme_0.5.2.bb
index b563cc6..cf0377a 100644
--- a/recipes-core/xml-commons/jaxme_0.5.2.bb
+++ b/recipes-core/xml-commons/jaxme_0.5.2.bb
@@ -45,7 +45,7 @@ do_compile() {
45# jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar 45# jaxme_build src/pm build-pm $cp jaxmepm-${PV}.jar
46} 46}
47 47
48do_install_append() { 48do_install:append() {
49 oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar 49 oe_jarinstall jaxmeapi-${PV}.jar jaxmeapi.jar
50 oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar 50 oe_jarinstall jaxmejs-${PV}.jar jaxmejs.jar
51 oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar 51 oe_jarinstall jaxmexs-${PV}.jar jaxmexs.jar
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
index 8b43c39..5a71655 100644
--- a/recipes-core/xml-commons/xom_1.2.10.bb
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -36,7 +36,7 @@ do_move_jaxen() {
36 36
37} 37}
38 38
39addtask move_jaxen after do_removebinaries before do_patch 39addtask move_jaxen after do:removebinaries before do_patch
40 40
41do_compile() { 41do_compile() {
42 mkdir -p build 42 mkdir -p build
diff --git a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
index 1f02cb7..2b8f959 100644
--- a/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
+++ b/recipes-core/xml-commons/xpp3_1.1.3.4.O.bb
@@ -39,11 +39,11 @@ do_compile() {
39 fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar . 39 fastjar -C build-xpath -c -f xpp3-xpath-${PV}.jar .
40} 40}
41 41
42do_install_append() { 42do_install:append() {
43 oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar 43 oe_jarinstall xpp3-xpath-${PV}.jar xpp3-xpath.jar
44} 44}
45 45
46FILES_libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*" 46FILES:libxpp3-xpath-java = "${datadir}/java/xpp3-xpath*"
47 47
48 48
49SRC_URI[md5sum] = "e1b6aeaad1cd06e64568aae1a507d5c6" 49SRC_URI[md5sum] = "e1b6aeaad1cd06e64568aae1a507d5c6"