[oe] [meta-java][PATCH 03/15] openjdk: autools not to override B var
jackie.huang at windriver.com
jackie.huang at windriver.com
Fri Dec 25 07:56:23 UTC 2015
From: Amy Fong <amy.fong at windriver.com>
${B} is set before autotools and thus is overrided
by autotools. Some of the patches within icedtea are
expected to be patched against ${S}/build (during
do_configure() phase). As autotools to change B
= "${WORKDIR}/build", so this causes some patches failed
to apply and hence breaks do_configure() with the following
errors:
| patching file openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
| can't find file to patch at input line 13
| Perhaps you used the wrong -p or --strip option?
| The text leading up to this was:
| --------------------------
| |---
| | build/openjdk/corba/make/common/shared/Defs-utils.gmk | 6 +++---
| | build/openjdk/jdk/make/common/Demo.gmk | 2 +-
| | build/openjdk/jdk/make/common/Release.gmk | 2 +-
| | build/openjdk/jdk/make/common/internal/ImportComponents.gmk | 4 ++--
| | build/openjdk/jdk/make/common/shared/Defs-utils.gmk | 6 +++---
| | build/openjdk/jdk/make/common/shared/Sanity.gmk | 2 +-
| | build/openjdk/jdk/make/java/redist/Makefile | 4 ++--
| | 7 files changed, 13 insertions(+), 13 deletions(-)
| |
| |--- a/build/openjdk/corba/make/common/shared/Defs-utils.gmk
| |+++ b/build/openjdk/corba/make/common/shared/Defs-utils.gmk
| --------------------------
| File to patch:
| Skip this patch? [y]
| File to patch:
| Skip this patch? [y]
| Skipping patch.
Signed-off-by: Vu Tran <vu.tran at windriver.com>
Signed-off-by: Amy Fong <amy.fong at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
recipes-core/openjdk/openjdk-common.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc
index dc26522..6a72572 100644
--- a/recipes-core/openjdk/openjdk-common.inc
+++ b/recipes-core/openjdk/openjdk-common.inc
@@ -7,7 +7,6 @@ SECTION = "libs"
ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}"
S = "${WORKDIR}/${ICEDTEA}"
-B = "${S}/build"
DEPENDS_append_libc-uclibc = " virtual/libiconv "
@@ -19,6 +18,8 @@ DEPENDS_append = " qemu-native "
inherit java autotools gettext qemu pkgconfig
+B = "${S}/build"
+
# OpenJDK uses slightly different names for certain arches. We need to know
# this to create some files which are expected by the build.
def get_jdk_arch(d):
--
1.9.1
More information about the Openembedded-devel
mailing list