diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2018-08-20 23:16:13 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2018-10-02 07:59:06 +0200 |
commit | b369a51972c4e83f28cf02de2ef9caad3087f00b (patch) | |
tree | 434ca8a6d96c9198a5eb621ad2bc62dc8557b9cc /recipes-core/openjdk/openjdk-common.inc | |
parent | a8415faa99f643e794ca2e0b920aff38ae348b75 (diff) | |
download | meta-java-b369a51972c4e83f28cf02de2ef9caad3087f00b.tar.gz |
openjdk-7: remove version dependent stuff from openjdk-common
Move the OpenJDK-7 specific parts from openjdk-common.inc to
openjdk-7-common.inc.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-common.inc | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-core/openjdk/openjdk-common.inc b/recipes-core/openjdk/openjdk-common.inc index ce3e39e..01a0a2a 100644 --- a/recipes-core/openjdk/openjdk-common.inc +++ b/recipes-core/openjdk/openjdk-common.inc | |||
@@ -1,44 +1,7 @@ | |||
1 | SUMMARY = "Java runtime based upon the OpenJDK- and Icedtea Project" | ||
2 | HOMEPAGE = "http://icedtea.classpath.org" | ||
3 | LICENSE = "GPL-2.0-with-classpath-exception" | ||
4 | PRIORITY = "optional" | ||
5 | SECTION = "libs" | ||
6 | |||
7 | ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}" | ||
8 | |||
9 | S = "${WORKDIR}/${ICEDTEA}" | ||
10 | |||
11 | DEPENDS_append_libc-uclibc = " virtual/libiconv " | ||
12 | |||
13 | # The OpenJDK build with interpreter optimizations for ARM depends on a binary | ||
14 | # that generates constants for an assembler source file. There is no other | ||
15 | # way than to generate this on a pseudo machine. Cross-compiling would not help | ||
16 | # because structure sizes and/or alignment may differ. | ||
17 | DEPENDS_append = " qemu-native " | ||
18 | |||
19 | inherit java autotools gettext qemu pkgconfig | 1 | inherit java autotools gettext qemu pkgconfig |
20 | inherit openjdk-build-helper | 2 | inherit openjdk-build-helper |
21 | 3 | ||
22 | B = "${S}/build" | ||
23 | |||
24 | JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}" | 4 | JDK_ARCH = "${@openjdk_build_helper_get_jdk_arch(d)}" |
25 | JDK_HOME = "${libdir_jvm}/${JDK_DIR}" | ||
26 | JDK_FAKE = "${WORKDIR}/fake-jdk" | ||
27 | |||
28 | # Puts an OE specific string into the binary making it possible for the user | ||
29 | # to know where it comes from (and blame the right people ...). | ||
30 | DIST_ID = "Built for ${DISTRO}" | ||
31 | DIST_NAME = "${DISTRO}" | ||
32 | EXTRA_OEMAKE = 'DIST_NAME="${DIST_NAME}" DIST_ID="${DIST_ID}"' | ||
33 | |||
34 | # llvm configure and compiles stuff | ||
35 | |||
36 | export WANT_LLVM_RELEASE = "2.8" | ||
37 | 5 | ||
38 | # Provides the target architecture to the configure script. | 6 | # Provides the target architecture to the configure script. |
39 | export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_arch(d)}" | 7 | export LLVM_CONFIGURE_ARCH="${@openjdk_build_helper_get_llvm_configure_arch(d)}" |
40 | |||
41 | # Large stack is required at least on x86_64 host, otherwise random segfaults appear: | ||
42 | QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 2097152" | ||
43 | |||
44 | EXTRA_OEMAKE += 'QEMU="${QEMU}"' | ||