diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2018-08-20 23:16:14 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-10-02 07:59:06 +0200 |
commit | 50d3e814a45363db81e446233c54895eebc5a999 (patch) | |
tree | ffa9ac9f2366d761a414535892d9fea3672347a7 | |
parent | b369a51972c4e83f28cf02de2ef9caad3087f00b (diff) | |
download | meta-java-50d3e814a45363db81e446233c54895eebc5a999.tar.gz |
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.inc | 7 |
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" | |||
4 | 4 | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3e0b59f8fac05c3c03d4a26bbda13f8f" |
6 | 6 | ||
7 | inherit java autotools gettext qemu pkgconfig | 7 | require openjdk-common.inc |
8 | inherit openjdk-build-helper | ||
9 | 8 | ||
10 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" | 9 | AUTOTOOLS_SCRIPT_PATH = "${S}/common/autoconf/" |
11 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" | 10 | export AUTOCONF_DIR="${AUTOTOOLS_SCRIPT_PATH}" |
@@ -160,10 +159,6 @@ do_configure_prepend() { | |||
160 | export ${@jdk_environment_options(d)} | 159 | export ${@jdk_environment_options(d)} |
161 | } | 160 | } |
162 | 161 | ||
163 | # Provide the translated target architectures | ||
164 | export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_arch(d)}" | ||
165 | JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}" | ||
166 | |||
167 | export DEBUG_BINARIES = "true" | 162 | export DEBUG_BINARIES = "true" |
168 | 163 | ||
169 | ALTERNATIVE_PRIORITY = "50" | 164 | ALTERNATIVE_PRIORITY = "50" |