diff options
-rw-r--r-- | recipes-core/openjdk/openjdk-8-common.inc | 2 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-161b15.inc | 33 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-162b12.inc | 83 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-16xbyy.inc | 87 | ||||
-rw-r--r-- | recipes-core/openjdk/openjdk-8_16xbyy.bb (renamed from recipes-core/openjdk/openjdk-8_162b12.bb) | 3 | ||||
-rw-r--r-- | recipes-core/openjdk/openjre-8_16xbyy.bb (renamed from recipes-core/openjdk/openjre-8_162b12.bb) | 3 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch | 35 |
7 files changed, 164 insertions, 82 deletions
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc index dbdd053..b2020c3 100644 --- a/recipes-core/openjdk/openjdk-8-common.inc +++ b/recipes-core/openjdk/openjdk-8-common.inc @@ -199,8 +199,6 @@ def get_jdk_arch(d): return jdk_arch JDK_ARCH = "${@get_jdk_arch(d)}" -# We do not yet work for aarch64. -COMPATIBLE_HOST = "^(?!aarch64).*" export DEBUG_BINARIES = "true" diff --git a/recipes-core/openjdk/openjdk-8-release-161b15.inc b/recipes-core/openjdk/openjdk-8-release-161b15.inc new file mode 100644 index 0000000..0a4434c --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-161b15.inc @@ -0,0 +1,33 @@ +require openjdk-8-release-16xbyy.inc + +CORBA_CHANGESET_aarch64 = "f73da600c483" +SRC_URI[corba.md5sum] = "bf884b82fcc6de466946fcb87d24ebf3" +SRC_URI[corba.sha256sum] = "ebf73d96185fc05e502088ae89a8d6494c3971dd220458deeff3876f72396b6c" + +HOTSPOT_CHANGESET_aarch64 = "a600839824fa" +SRC_URI[hotspot.md5sum] = "20c88ba26f8f45a2769f4edf32afd593" +SRC_URI[hotspot.sha256sum] = "6d0d1b9c2df3392ad6e21ca3eae39d06b50632a4a419da3d4363248943ea8b97" + +JAXP_CHANGESET_aarch64 = "b1e2af899046" +SRC_URI[jaxp.md5sum] = "219582b26d7de2973b75f4329b53ec7d" +SRC_URI[jaxp.sha256sum] = "907cc4dfb01a3a2a6d74dfa90fa6fcb5b3df55600f41ba44dcdc94b47e85a382" + +JAXWS_CHANGESET_aarch64 = "0002ed323fe5" +SRC_URI[jaxws.md5sum] = "44935b81e3405fcaef675d5d08c2149e" +SRC_URI[jaxws.sha256sum] = "0d1d52f1cf254a643ece1bd6cd8628fae1a4d56e8b59388cc9ad73b3caf151a1" + +JDK_CHANGESET_aarch64 = "c2ba2ed87d18" +SRC_URI[jdk.md5sum] = "f4c0393a157dcb8b90ee7c7d80cbdfbf" +SRC_URI[jdk.sha256sum] = "c84a17451b47242f9d96bf431011607afc3776f285a6ad9a60190fba2d434c49" + +LANGTOOLS_CHANGESET_aarch64 = "cdb217c578cb" +SRC_URI[langtools.md5sum] = "608cf07781259d916d1663d6a5ced26d" +SRC_URI[langtools.sha256sum] = "ad28e75bfaba1b64fdd02ea316db3ba3cba68007f90c5fa2be2418ce8bc0074d" + +NASHORN_CHANGESET_aarch64 = "505d0eb2fafe" +SRC_URI[nashorn.md5sum] = "be981a6c55f9e602ff129fed65505a8c" +SRC_URI[nashorn.sha256sum] = "14419ccd773e1db83b600d05aca3cbac9f24be77abda9a132d12305d8821d6d7" + +OPENJDK_CHANGESET_aarch64 = "917454da25c1" +SRC_URI[openjdk.md5sum] = "1e4b3eca032742b7448731f9b8fcb426" +SRC_URI[openjdk.sha256sum] = "1e17e2d8384a7b808a89b982e7c09c4feb8598b7a66b93697bfb8759c1005974" diff --git a/recipes-core/openjdk/openjdk-8-release-162b12.inc b/recipes-core/openjdk/openjdk-8-release-162b12.inc index dc1e023..bc2b342 100644 --- a/recipes-core/openjdk/openjdk-8-release-162b12.inc +++ b/recipes-core/openjdk/openjdk-8-release-162b12.inc @@ -1,58 +1,7 @@ -PATCHES_URI = "\ - file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ - file://filter-aclocal-copy-too.patch;striplevel=0 \ - file://dont-expect-fqpn-for-make.patch;striplevel=0 \ - file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ - file://openjdk8-no-unused-deps.patch;striplevel=0 \ - file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ - file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ - file://0001-jdk-comparison-between-pointer-and-integer.patch \ - file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ - file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ - file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ - file://0005-hotspot-use-correct-include-for-poll.patch \ - file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ - file://0007-jdk-use-correct-include-for-poll.patch \ - file://0008-jdk-use-correct-include-for-signal.patch \ - file://0009-jdk-disable-backtrace-musl-build-fix.patch \ -" -# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -PATCHES_URI_append_class-target = "\ - file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ - file://openjdk8-fix-shark-build.patch;striplevel=0 \ - file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ - file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ - file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ - file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ - file://openjdk8-fix-libpng-neon-build.patch;striplevel=0 \ -" -PATCHES_URI_append_libc-musl = "\ - file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ - file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ - file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ - file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ - file://musl-0005-hotspot-disable-agent-build.patch \ - file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ - file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ - file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ - file://musl-0009-jdk-musl-has-gethostby_r.patch \ -" +require openjdk-8-release-16xbyy.inc -# Name of the directory containing the compiled output -BUILD_DIR = "openjdk.build" -BUILD_DIR_ECJ = "openjdk.build-ecj" - -# Force arm mode for now -ARM_INSTRUCTION_SET_armv4t = "ARM" - -# readdir_r was deprecated in glibc-2.24. Ignore the error for now -# NOTE: When updating the recipe, please check if this is still needed -CFLAGS_append = " -Wno-error=deprecated-declarations" - -# Enable zero mode for arm based builds, as normal hotspot fails to build -PACKAGECONFIG_append_arm = " zero" +# We do not yet work for aarch64. +COMPATIBLE_HOST = "^(?!aarch64).*" CORBA_CHANGESET = "f6b6ad6feb6e" SRC_URI[corba.md5sum] = "0358300224b63f3deeba63d3de7d765c" @@ -86,33 +35,7 @@ OPENJDK_CHANGESET = "4be07cb28b21" SRC_URI[openjdk.md5sum] = "24d30b66aaaef51af9b598c8989c1c82" SRC_URI[openjdk.sha256sum] = "8f9ecc5fc5f9c6df671a2ef07949f86080823c89954b2b87f6727a82af679eca" -OPENJDK_HG_U = "jdk8u" -OPENJDK_HG_URL = "http://hg.openjdk.java.net/jdk8u/${OPENJDK_HG_U}" - -OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" -OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};name=openjdk" - -HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" -HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" - -CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" -CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" -JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" -JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" - -JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" -JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" - -JDK_FILE = "${JDK_CHANGESET}.tar.bz2" -JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" - -LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" -LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" - -NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" -NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};name=nashorn;unpack=false" -# #CACAO_VERSION = "e215e36be9fc" #CACAO_FILE = "${CACAO_VERSION}.tar.gz" #CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" diff --git a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc new file mode 100644 index 0000000..ab72830 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc @@ -0,0 +1,87 @@ +PATCHES_URI = "\ + file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ + file://filter-aclocal-copy-too.patch;striplevel=0 \ + file://dont-expect-fqpn-for-make.patch;striplevel=0 \ + file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ + file://openjdk8-no-unused-deps.patch;striplevel=0 \ + file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ + file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ + file://0001-jdk-comparison-between-pointer-and-integer.patch \ + file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ + file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ + file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ + file://0005-hotspot-use-correct-include-for-poll.patch \ + file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ + file://0007-jdk-use-correct-include-for-poll.patch \ + file://0008-jdk-use-correct-include-for-signal.patch \ + file://0009-jdk-disable-backtrace-musl-build-fix.patch \ +" +# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch +# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html +# by Roman Kennke (rkennke at redhat.com) +LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" +LIBPNG_NEON_PATCH_aarch64 = "" +PATCHES_URI_append_class-target = "\ + file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ + file://openjdk8-fix-shark-build.patch;striplevel=0 \ + file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ + file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ + file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ + file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ + ${LIBPNG_NEON_PATCH} \ +" +PATCHES_URI_append_libc-musl = "\ + file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ + file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ + file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ + file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ + file://musl-0005-hotspot-disable-agent-build.patch \ + file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ + file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ + file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ + file://musl-0009-jdk-musl-has-gethostby_r.patch \ +" +PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" + +# Name of the directory containing the compiled output +BUILD_DIR = "openjdk.build" +BUILD_DIR_ECJ = "openjdk.build-ecj" + +# Force arm mode for now +ARM_INSTRUCTION_SET_armv4t = "ARM" + +# readdir_r was deprecated in glibc-2.24. Ignore the error for now +# NOTE: When updating the recipe, please check if this is still needed +CFLAGS_append = " -Wno-error=deprecated-declarations" + +# Enable zero mode for arm based builds, as normal hotspot fails to build +PACKAGECONFIG_append_arm = " zero" + +OPENJDK_ARCH_PORT = "jdk8u" +OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" +OPENJDK_HG_U = "jdk8u" +OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" + +OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};name=openjdk" + +HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" +HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" + +CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" +CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" + +JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" +JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" + +JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" +JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" + +JDK_FILE = "${JDK_CHANGESET}.tar.bz2" +JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" + +LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" +LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" + +NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" +NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};name=nashorn;unpack=false" diff --git a/recipes-core/openjdk/openjdk-8_162b12.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb index 11208a1..dd0ed1d 100644 --- a/recipes-core/openjdk/openjdk-8_162b12.bb +++ b/recipes-core/openjdk/openjdk-8_16xbyy.bb @@ -1,3 +1,6 @@ +PV = "162b12" +PV_aarch64 = "161b15" + require openjdk-8-release-${PV}.inc require openjdk-8-cross.inc diff --git a/recipes-core/openjdk/openjre-8_162b12.bb b/recipes-core/openjdk/openjre-8_16xbyy.bb index 263091d..e6454ea 100644 --- a/recipes-core/openjdk/openjre-8_162b12.bb +++ b/recipes-core/openjdk/openjre-8_16xbyy.bb @@ -1,3 +1,6 @@ +PV = "162b12" +PV_aarch64 = "161b15" + require openjdk-8-release-${PV}.inc require openjdk-8-cross.inc diff --git a/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch b/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch new file mode 100644 index 0000000..436f012 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/hotspot-remaining-musl-fixes-aarch64.patch @@ -0,0 +1,35 @@ +From 8e8e79c136fe56db119fd9a76fb881e96727c840 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> +Date: Tue, 27 Feb 2018 15:33:17 +0000 +Subject: [PATCH] hotspot: remaining musl fixes (aarch64) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* fpu_control.h doesn't exist in musl +| hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp:78:11: fatal error: fpu_control.h: No such file or directory +| # include <fpu_control.h> +| ^~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik <andre.draszik@jci.com> +--- + hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +index 8b985693..23f196cd 100644 +--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp ++++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +@@ -75,7 +75,7 @@ + # include <pwd.h> + # include <poll.h> + # include <ucontext.h> +-# include <fpu_control.h> ++# include <linux/types.h> /* provides __u64 */ + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP +-- +2.16.1 + |