aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2018-08-20 23:16:14 +0200
committerRichard Leitner <richard.leitner@skidata.com>2018-10-02 07:59:06 +0200
commit50d3e814a45363db81e446233c54895eebc5a999 (patch)
treeffa9ac9f2366d761a414535892d9fea3672347a7
parentb369a51972c4e83f28cf02de2ef9caad3087f00b (diff)
downloadmeta-java-50d3e814a45363db81e446233c54895eebc5a999.tar.gz
meta-java-50d3e814a45363db81e446233c54895eebc5a999.tar.bz2
meta-java-50d3e814a45363db81e446233c54895eebc5a999.zip
openjdk-8: use openjdk-common
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@skidata.com>
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc7
1 files changed, 1 insertions, 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"