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