summaryrefslogtreecommitdiffstats
path: root/recipes-core/cacao
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/cacao
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/cacao')
-rw-r--r--recipes-core/cacao/cacao-initial-native_0.98.bb2
-rw-r--r--recipes-core/cacao/cacao_git.bb24
2 files changed, 13 insertions, 13 deletions
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 = "-"