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/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 +- 3 files changed, 51 insertions(+), 51 deletions(-) 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 (limited to 'recipes-core/jamvm') 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 = "" -- cgit v1.2.3-54-g00ecf