[oe] [meta-java][PATCH 6/7] openjdk-8: use openjdk-common

Richard Leitner richard.leitner at skidata.com
Mon Aug 20 21:16:14 UTC 2018


As openjdk-common.inc now serves all OpenJDK version let
openjdk-8-common require it. Furthermore remove the now duplicated
lines.

Signed-off-by: Richard Leitner <richard.leitner at skidata.com>
---
 recipes-core/openjdk/openjdk-8-common.inc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index e45bcf4..4d8f935 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -4,8 +4,7 @@ LICENSE  = "GPL-2.0-with-classpath-exception"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f"
 
-inherit java autotools gettext qemu pkgconfig
-inherit openjdk-build-helper
+require openjdk-common.inc
 
 AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/"
 export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}"
@@ -160,10 +159,6 @@ do_configure_prepend() {
         export ${@jdk_environment_options(d)}
 }
 
-# Provide the translated target architectures
-export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_arch(d)}"
-JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}"
-
 export DEBUG_BINARIES = "true"
 
 ALTERNATIVE_PRIORITY = "50"
-- 
2.11.0




More information about the Openembedded-devel mailing list