From bd9c60238c4c62d9a0f2d60b89aef429a1b71e34 Mon Sep 17 00:00:00 2001 From: Magnus Olsson Date: Tue, 10 Mar 2015 13:19:54 +0100 Subject: initials: silence "populate_sysroot manifest not found" warnings A number of recipes in meta-java use autotools.bbclass for building; internally it uses the sstate-control populate_sysroot manifests to locate and copy aslocals for configure dependencies as part of the do_configure step. The manifest path differs depending on if it's a native package or not so autotools.bbclass looks at the package name to determine if its native or not (it's native if it ends with "-native"). The warnings are emitted because a few (native) recipes in meta-java (such as cacao-initial, classpath-initial and more) are incorrectly being classified as non-native by autotools.bbclass, which makes it look for the manifest in the wrong place and finally gives up with the warning: WARNING: /home/oe/tmp-glibc/sstate-control/manifest-mymachine-libecj-bootstrap.populate_sysroot not found This happens for cacao-initial, classpath-initial, ecj-initial, libecj-boostrap, jamvm-initial and jikes-initial since they are all native and rely on autotools. This patch renames the recipes so they end with -native, e.g ecj-initial-native. It also updates the recipes so they DEPEND on the corresponding new name. This helps autotools.bbclass to properly classify the recipes are native and silence the warnings. Signed-off-by: Magnus Olsson Signed-off-by: Otavio Salvador --- recipes-core/cacao/cacao-initial-native_0.98.bb | 42 ++++++++++++++++++ recipes-core/cacao/cacao-initial_0.98.bb | 42 ------------------ recipes-core/cacao/cacao_1.6.1.bb | 2 +- .../classpath/classpath-initial-native_0.93.bb | 50 ++++++++++++++++++++++ recipes-core/classpath/classpath-initial_0.93.bb | 50 ---------------------- recipes-core/classpath/classpath-native_0.99.bb | 2 +- recipes-core/ecj/ecj-bootstrap-native.bb | 2 +- recipes-core/ecj/ecj-initial-native.bb | 32 ++++++++++++++ recipes-core/ecj/ecj-initial.bb | 32 -------------- recipes-core/ecj/libecj-bootstrap-native_3.6.2.bb | 9 ++++ recipes-core/ecj/libecj-bootstrap.inc | 2 +- recipes-core/ecj/libecj-bootstrap_3.6.2.bb | 9 ---- recipes-core/jamvm/jamvm-initial-native_1.4.5.bb | 50 ++++++++++++++++++++++ recipes-core/jamvm/jamvm-initial_1.4.5.bb | 50 ---------------------- recipes-core/jamvm/jamvm.inc | 2 +- recipes-core/jikes/jikes-initial-native.bb | 22 ++++++++++ recipes-core/jikes/jikes-initial.bb | 22 ---------- 17 files changed, 210 insertions(+), 210 deletions(-) create mode 100644 recipes-core/cacao/cacao-initial-native_0.98.bb delete mode 100644 recipes-core/cacao/cacao-initial_0.98.bb create mode 100644 recipes-core/classpath/classpath-initial-native_0.93.bb delete mode 100644 recipes-core/classpath/classpath-initial_0.93.bb create mode 100644 recipes-core/ecj/ecj-initial-native.bb delete mode 100644 recipes-core/ecj/ecj-initial.bb create mode 100644 recipes-core/ecj/libecj-bootstrap-native_3.6.2.bb delete mode 100644 recipes-core/ecj/libecj-bootstrap_3.6.2.bb create mode 100644 recipes-core/jamvm/jamvm-initial-native_1.4.5.bb delete mode 100644 recipes-core/jamvm/jamvm-initial_1.4.5.bb create mode 100644 recipes-core/jikes/jikes-initial-native.bb delete mode 100644 recipes-core/jikes/jikes-initial.bb diff --git a/recipes-core/cacao/cacao-initial-native_0.98.bb b/recipes-core/cacao/cacao-initial-native_0.98.bb new file mode 100644 index 0000000..181faca --- /dev/null +++ b/recipes-core/cacao/cacao-initial-native_0.98.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "CacaoVM for use as OpenEmbedded's Java VM" +HOMEPAGE = "http://www.cacaojvm.org/" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +SECTION = "interpreters" + +PROVIDES = "virtual/java-initial" + +inherit native autotools-brokensep + +DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial-native jikes-initial-native" + +SRC_URI = "\ + http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \ + file://cacao-0.98-initial.patch \ + file://disable_hw_exceptions.patch \ + " + +# libjvm disabled - it would conflict with cacao-native installations +EXTRA_OECONF = "\ + --enable-debug \ + --with-classpath-libdir=${libdir} \ + --with-classpath-includedir=${includedir}/classpath-initial \ + --with-classpath-classes=${datadir}/classpath-initial/glibj.zip \ + --with-vm-zip=${datadir}/cacao-initial/vm.zip \ + --program-suffix=-initial \ + --disable-libjvm \ + " + +# enforces the usage of jikes-initial +export JAVAC="jikes-initial" + +# enforces the usage of fastjar +export JAR="fastjar" + +do_configure_append() { + # Fix the executable name in the wrapper script. + sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in +} + +SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346" +SRC_URI[sha256sum] = "cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188" diff --git a/recipes-core/cacao/cacao-initial_0.98.bb b/recipes-core/cacao/cacao-initial_0.98.bb deleted file mode 100644 index ad9436b..0000000 --- a/recipes-core/cacao/cacao-initial_0.98.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "CacaoVM for use as OpenEmbedded's Java VM" -HOMEPAGE = "http://www.cacaojvm.org/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SECTION = "interpreters" - -PROVIDES = "virtual/java-initial" - -inherit native autotools-brokensep - -DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial jikes-initial" - -SRC_URI = "\ - http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \ - file://cacao-0.98-initial.patch \ - file://disable_hw_exceptions.patch \ - " - -# libjvm disabled - it would conflict with cacao-native installations -EXTRA_OECONF = "\ - --enable-debug \ - --with-classpath-libdir=${libdir} \ - --with-classpath-includedir=${includedir}/classpath-initial \ - --with-classpath-classes=${datadir}/classpath-initial/glibj.zip \ - --with-vm-zip=${datadir}/cacao-initial/vm.zip \ - --program-suffix=-initial \ - --disable-libjvm \ - " - -# enforces the usage of jikes-initial -export JAVAC="jikes-initial" - -# enforces the usage of fastjar -export JAR="fastjar" - -do_configure_append() { - # Fix the executable name in the wrapper script. - sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in -} - -SRC_URI[md5sum] = "8b8907c8b925761c9410bcadb9705346" -SRC_URI[sha256sum] = "cb9363add825cedf77764fc49a223aaf43f0a9f485b711ba8c92f16b13fff188" diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb index 2bd06c6..9f07946 100644 --- a/recipes-core/cacao/cacao_1.6.1.bb +++ b/recipes-core/cacao/cacao_1.6.1.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "interpreters" -DEPENDS_class-native = "zlib-native libtool-native ecj-initial fastjar-native classpath-native" +DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-native" PROVIDES_class-native = "virtual/java-native" DEPENDS = "zlib libtool classpath virtual/javac-native" diff --git a/recipes-core/classpath/classpath-initial-native_0.93.bb b/recipes-core/classpath/classpath-initial-native_0.93.bb new file mode 100644 index 0000000..0cfa693 --- /dev/null +++ b/recipes-core/classpath/classpath-initial-native_0.93.bb @@ -0,0 +1,50 @@ +# No later version of Classpath may be used because this is the latest that can be compiled +# by jikes! + +require classpath-native.inc + +DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." +LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" +DEPENDS += "jikes-native" + +PR = "${INC_PR}.2" + +SRC_URI += " \ + file://autotools.patch \ + file://miscompilation.patch \ + " + +EXTRA_OECONF = " \ + --with-jikes=jikes \ + --with-fastjar=fastjar \ + --with-glibj \ + --disable-Werror \ + --disable-local-sockets \ + --disable-alsa \ + --disable-gconf-peer \ + --disable-gtk-peer \ + --disable-plugin \ + --disable-dssi \ + --disable-examples \ + --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ + --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ + --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ + --with-vm=java \ + " + +# Ensure tools.zip is not installed at same path as classpath-native +EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" + +# remove files clashing with classpath-native in sysroot +do_install_append() { + + for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid + do + rm ${D}${bindir}/${i} + done + rm ${D}${libdir}/logging.properties + rm ${D}${libdir}/security/classpath.security +} +SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" +SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" + diff --git a/recipes-core/classpath/classpath-initial_0.93.bb b/recipes-core/classpath/classpath-initial_0.93.bb deleted file mode 100644 index 0cfa693..0000000 --- a/recipes-core/classpath/classpath-initial_0.93.bb +++ /dev/null @@ -1,50 +0,0 @@ -# No later version of Classpath may be used because this is the latest that can be compiled -# by jikes! - -require classpath-native.inc - -DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" -DEPENDS += "jikes-native" - -PR = "${INC_PR}.2" - -SRC_URI += " \ - file://autotools.patch \ - file://miscompilation.patch \ - " - -EXTRA_OECONF = " \ - --with-jikes=jikes \ - --with-fastjar=fastjar \ - --with-glibj \ - --disable-Werror \ - --disable-local-sockets \ - --disable-alsa \ - --disable-gconf-peer \ - --disable-gtk-peer \ - --disable-plugin \ - --disable-dssi \ - --disable-examples \ - --with-glibj-dir=${STAGING_DATADIR_NATIVE}/classpath-initial \ - --with-native-libdir=${STAGING_LIBDIR_NATIVE}/classpath-initial \ - --includedir=${STAGING_INCDIR_NATIVE}/classpath-initial \ - --with-vm=java \ - " - -# Ensure tools.zip is not installed at same path as classpath-native -EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial" - -# remove files clashing with classpath-native in sysroot -do_install_append() { - - for i in gappletviewer gjarsigner gkeytool gjar gnative2ascii gserialver grmiregistry gtnameserv gorbd grmid - do - rm ${D}${bindir}/${i} - done - rm ${D}${libdir}/logging.properties - rm ${D}${libdir}/security/classpath.security -} -SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d" -SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945" - diff --git a/recipes-core/classpath/classpath-native_0.99.bb b/recipes-core/classpath/classpath-native_0.99.bb index ece10c3..02951b9 100644 --- a/recipes-core/classpath/classpath-native_0.99.bb +++ b/recipes-core/classpath/classpath-native_0.99.bb @@ -1,7 +1,7 @@ require classpath-native.inc LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510" -DEPENDS += "ecj-initial" +DEPENDS += "ecj-initial-native" PR = "${INC_PR}.0" diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb index c9be269..e159c9d 100644 --- a/recipes-core/ecj/ecj-bootstrap-native.bb +++ b/recipes-core/ecj/ecj-bootstrap-native.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d " PR = "r1" -DEPENDS = "libecj-bootstrap virtual/java-native" +DEPENDS = "libecj-bootstrap-native virtual/java-native" PROVIDES = "virtual/javac-native" diff --git a/recipes-core/ecj/ecj-initial-native.bb b/recipes-core/ecj/ecj-initial-native.bb new file mode 100644 index 0000000..ed334ed --- /dev/null +++ b/recipes-core/ecj/ecj-initial-native.bb @@ -0,0 +1,32 @@ +# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more +# and no less features. + +# This variant runs on the initial (not Java5-compatible runtime). + +DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" +HOMEPAGE = "http://www.eclipse.org/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +DEPENDS = "libecj-bootstrap-native" + +SRC_URI = "file://ecj-initial.in" + +S = "${WORKDIR}" + +inherit native + +JAR = "ecj-bootstrap.jar" + +do_compile() { + # Create the start script + echo "#!/bin/sh" > ecj-initial + echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial + echo "RUNTIME=java-initial" >> ecj-initial + cat ecj-initial.in >> ecj-initial +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/ecj-initial ${D}${bindir} +} diff --git a/recipes-core/ecj/ecj-initial.bb b/recipes-core/ecj/ecj-initial.bb deleted file mode 100644 index 45317a6..0000000 --- a/recipes-core/ecj/ecj-initial.bb +++ /dev/null @@ -1,32 +0,0 @@ -# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more -# and no less features. - -# This variant runs on the initial (not Java5-compatible runtime). - -DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant" -HOMEPAGE = "http://www.eclipse.org/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -DEPENDS = "libecj-bootstrap" - -SRC_URI = "file://ecj-initial.in" - -S = "${WORKDIR}" - -inherit native - -JAR = "ecj-bootstrap.jar" - -do_compile() { - # Create the start script - echo "#!/bin/sh" > ecj-initial - echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial - echo "RUNTIME=java-initial" >> ecj-initial - cat ecj-initial.in >> ecj-initial -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/ecj-initial ${D}${bindir} -} diff --git a/recipes-core/ecj/libecj-bootstrap-native_3.6.2.bb b/recipes-core/ecj/libecj-bootstrap-native_3.6.2.bb new file mode 100644 index 0000000..51dbca0 --- /dev/null +++ b/recipes-core/ecj/libecj-bootstrap-native_3.6.2.bb @@ -0,0 +1,9 @@ +require libecj-bootstrap.inc + +PR = "${INC_PR}.0" + +SRC_URI = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/ecjsrc-${PV}.zip" + +SRC_URI[md5sum] = "3f3ca1973dd7a21780525c9ffba7a263" +SRC_URI[sha256sum] = "94f2095d38d71b414a593ec56847008bec267a926ec935959fecdde44f98467f" + diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index cd9d90f..9fb4156 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.eclipse.org/" LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/EPL-1.0;md5=57f8d5e2b3e98ac6e088986c12bf94e6" -DEPENDS = "fastjar-native jikes-initial virtual/java-initial" +DEPENDS = "fastjar-native jikes-initial-native virtual/java-initial" INC_PR = "r5" diff --git a/recipes-core/ecj/libecj-bootstrap_3.6.2.bb b/recipes-core/ecj/libecj-bootstrap_3.6.2.bb deleted file mode 100644 index 51dbca0..0000000 --- a/recipes-core/ecj/libecj-bootstrap_3.6.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require libecj-bootstrap.inc - -PR = "${INC_PR}.0" - -SRC_URI = "http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/ecjsrc-${PV}.zip" - -SRC_URI[md5sum] = "3f3ca1973dd7a21780525c9ffba7a263" -SRC_URI[sha256sum] = "94f2095d38d71b414a593ec56847008bec267a926ec935959fecdde44f98467f" - diff --git a/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb new file mode 100644 index 0000000..25b42b0 --- /dev/null +++ b/recipes-core/jamvm/jamvm-initial-native_1.4.5.bb @@ -0,0 +1,50 @@ +SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +DEPENDS = "zlib-native classpath-initial-native jikes-initial-native libffi-native" + +PROVIDES = "virtual/java-initial" + +PR = "r1" + +S = "${WORKDIR}/jamvm-${PV}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ + file://libffi.patch \ + file://jamvm-initial.patch \ + file://java-initial \ + " + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit native autotools pkgconfig + +# libdir must be modified so that jamvm-initial and -native +# do not interfere +EXTRA_OECONF = "\ + --with-classpath-install-dir=${prefix} \ + --program-suffix=-initial \ + --libdir=${STAGING_LIBDIR}/jamvm-initial \ + --enable-ffi \ + " + +# jamvm-initial has to run some binaries which need lots of memory. +CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" + +# Enforce usage of jikes-initial. +EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \ + GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \ + " +do_install_append() { + install -d ${D}${bindir}/ + install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ +} + +SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b" +SRC_URI[sha256sum] = "f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5" +# shared state for jamvm-native does not work +# since the paths are hardcoded +#SSTATE_MIRRORS_class-native = "" diff --git a/recipes-core/jamvm/jamvm-initial_1.4.5.bb b/recipes-core/jamvm/jamvm-initial_1.4.5.bb deleted file mode 100644 index 4c64f6a..0000000 --- a/recipes-core/jamvm/jamvm-initial_1.4.5.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specification version 2." -HOMEPAGE = "http://jamvm.sourceforge.net/" -LICENSE = "GPL" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native" - -PROVIDES = "virtual/java-initial" - -PR = "r1" - -S = "${WORKDIR}/jamvm-${PV}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \ - file://libffi.patch \ - file://jamvm-initial.patch \ - file://java-initial \ - " - -# This uses 32 bit arm, so force the instruction set to arm, not thumb -ARM_INSTRUCTION_SET = "arm" - -inherit native autotools pkgconfig - -# libdir must be modified so that jamvm-initial and -native -# do not interfere -EXTRA_OECONF = "\ - --with-classpath-install-dir=${prefix} \ - --program-suffix=-initial \ - --libdir=${STAGING_LIBDIR}/jamvm-initial \ - --enable-ffi \ - " - -# jamvm-initial has to run some binaries which need lots of memory. -CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB" - -# Enforce usage of jikes-initial. -EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/jikes-initial \ - GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-inital/glibj.zip \ - " -do_install_append() { - install -d ${D}${bindir}/ - install -m 0755 ${WORKDIR}/java-initial ${D}${bindir}/ -} - -SRC_URI[md5sum] = "3f538bab6e1c77aed331e5e71f754f5b" -SRC_URI[sha256sum] = "f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5" -# shared state for jamvm-native does not work -# since the paths are hardcoded -#SSTATE_MIRRORS_class-native = "" diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc index 094b22b..5893cbc 100644 --- a/recipes-core/jamvm/jamvm.inc +++ b/recipes-core/jamvm/jamvm.inc @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" DEPENDS = "zlib classpath virtual/javac-native libffi" -DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial libffi-native" +DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native" RDEPENDS_${PN} = "classpath" RDEPENDS_${PN}_virtclass-native = "" diff --git a/recipes-core/jikes/jikes-initial-native.bb b/recipes-core/jikes/jikes-initial-native.bb new file mode 100644 index 0000000..239dea3 --- /dev/null +++ b/recipes-core/jikes/jikes-initial-native.bb @@ -0,0 +1,22 @@ +SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" +DEPENDS = "jikes-native classpath-initial-native" + +S = "${WORKDIR}" + +inherit native + +do_configure() { + : +} + +do_compile() { + echo "#!/bin/sh" > jikes-initial + echo "${STAGING_BINDIR_NATIVE}/jikes -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip \$@" >> jikes-initial +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 jikes-initial ${D}${bindir} +} diff --git a/recipes-core/jikes/jikes-initial.bb b/recipes-core/jikes/jikes-initial.bb deleted file mode 100644 index 4e6e870..0000000 --- a/recipes-core/jikes/jikes-initial.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" -DEPENDS = "jikes-native classpath-initial" - -S = "${WORKDIR}" - -inherit native - -do_configure() { - : -} - -do_compile() { - echo "#!/bin/sh" > jikes-initial - echo "${STAGING_BINDIR_NATIVE}/jikes -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip \$@" >> jikes-initial -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 jikes-initial ${D}${bindir} -} -- cgit v1.2.3-54-g00ecf