1 files changed, 40 insertions, 51 deletions

diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index bd3092f..ff8d96e 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -1,3 +1,4 @@
+
 PATCHES_URI = "\
     file://0001-Allow-using-a-system-installed-libjpeg.patch \
     file://0002-Allow-using-a-system-installed-libpng.patch \
@@ -9,6 +10,7 @@ PATCHES_URI = "\
     file://0008-autoconf-fix-shark-build-common.patch \
     file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \
     file://0010-autoconf-remove-shell-variables-from-autoheader.patch \
+    file://0013-autoconf-remove-Werror.patch \
     ${HOTSPOT_UB_PATCH} \
     file://2001-jdk-comparison-between-pointer-and-integer.patch \
     file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \
@@ -18,38 +20,35 @@ PATCHES_URI = "\
     file://2006-jdk-disable-backtrace-musl-build-fix.patch \
     file://2007-jdk-no-genx11-in-headless.patch \
     file://2008-jdk-no-unused-deps.patch \
-    file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \
+    file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch \
 "
 HOTSPOT_UB_PATCH = "\
     file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \
     file://1002-hotspot-use-correct-include-for-poll.patch \
     file://1003-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \
-    file://1004-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \
-    file://1005-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \
-    file://1006-hotspot-Zero-build-requires-disabled-warnings.patch \
-    file://1007-hotspot-Missing-return-statement-in-__sync_val_compa.patch \
-    file://1008-hotspot-Turn-on-the-Wreturn-type-warning.patch \
-    file://1009-hotspot-handle-format-error-for-GCC-7.patch \
+    file://1004-hotspot-fix-Wreturn-type-issues-introduced-by-806165.patch \
+    file://1005-hotspot-Zero-build-requires-disabled-warnings.patch \
+    file://1006-hotspot-Missing-return-statement-in-__sync_val_compa.patch \
+    file://1007-hotspot-Turn-on-the-Wreturn-type-warning.patch \
+    file://1008-hotspot-handle-format-error-for-GCC-7.patch \
+    file://1012-hotspot-enable-Wno-error.patch \
 "
-HOTSPOT_UB_PATCH_append_class-target = "\
-    file://1010-hotspot-fix-adlc-flags.patch \
-    file://1011-hotspot-fix-shark-build-common.patch \
-    file://1012-hotspot-restrict-to-staging-dir.patch \
+HOTSPOT_UB_PATCH:append:class-target = "\
+    file://1009-hotspot-fix-adlc-flags.patch \
+    file://1010-hotspot-fix-shark-build-common.patch \
+    file://1011-hotspot-restrict-to-staging-dir.patch \
 "
-HOTSPOT_UB_PATCH_prepend_aarch64 = "\
-    file://aarch64-hotspot-Fix-further-functions-with-a-missing.patch \
+HOTSPOT_UB_PATCH:prepend:aarch64 = "\
+    file://1401-hotspot-aarch64-Add-missing-return-value-to-LIR_Asse.patch \
 "
-HOTSPOT_UB_PATCH_append_armv7a = " file://aarch32-hotspot-fix-missing-return-values.patch"
-HOTSPOT_UB_PATCH_append_armv7ve = " file://aarch32-hotspot-fix-missing-return-values.patch"
+HOTSPOT_UB_PATCH:append:armv7a = " file://1201-hotspot-aarch32-fix-missing-return-values.patch"
+HOTSPOT_UB_PATCH:append:armv7ve = " file://1201-hotspot-aarch32-fix-missing-return-values.patch"
 
-PATCHES_URI_append_class-target = "\
-    ${FIX_SHARK_BUILD_PT2_PATCH} \
+PATCHES_URI:append:class-target = "\
+    file://1013-hotspot-add-missing-includes-for-shark-build-pt2.patch \
 "
-FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0"
-FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0"
-FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://aarch32-hotspot-fix-shark-build-pt2.patch;striplevel=0"
 
-PATCHES_URI_append_libc-musl = "\
+PATCHES_URI:append:libc-musl = "\
     ${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 \
@@ -63,55 +62,45 @@ PATCHES_URI_append_libc-musl = "\
     file://musl-0009-jdk-musl-has-gethostby_r.patch \
 "
 OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch"
-OBSOLETE_ISNANF_PATCH_armv7a = ""
-OBSOLETE_ISNANF_PATCH_armv7ve = ""
+OBSOLETE_ISNANF_PATCH:armv7a = ""
+OBSOLETE_ISNANF_PATCH:armv7ve = ""
 DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch"
-DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
-DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
+DISABLE_AGENT_BUILD_PT2:armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
+DISABLE_AGENT_BUILD_PT2:armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch"
 REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch"
-REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
-REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
+REMOVE_GLIBC_DEPENDENCIES_PT2:armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
+REMOVE_GLIBC_DEPENDENCIES_PT2:armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch"
 
-PATCHES_URI_append_libc-musl_armv7a = " file://aarch32-hotspot-remaining-musl-fixes.patch"
-PATCHES_URI_append_libc-musl_armv7ve = " file://aarch32-hotspot-remaining-musl-fixes.patch"
-PATCHES_URI_append_libc-musl_aarch64 = " file://aarch64-hotspot-remaining-musl-fixes.patch"
+PATCHES_URI:append:libc-musl:armv7a = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch"
+PATCHES_URI:append:libc-musl:armv7ve = " file://1202-hotspot-aarch32-remaining-musl-fixes.patch"
+PATCHES_URI:append:libc-musl:aarch64 = " file://1402-hotspot-aarch64-remaining-musl-fixes.patch"
 
 # remove aarch32 & aarch64 mainlined patches
-PATCHES_URI_remove_armv7a = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
-PATCHES_URI_remove_armv7ve = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
-PATCHES_URI_remove_aarch64 = "file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch"
+PATCHES_URI:remove:armv7a = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch"
+PATCHES_URI:remove:armv7ve = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.patch"
+PATCHES_URI:remove:aarch64 = "file://2009-jdk-make-use-gcc-instead-of-ld-for-genSocketOptionRe.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
-BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations"
-TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations"
-
-# WORKAROUND: disable the "specified bound depends on the length of the source argument"
-# compiler error until we update openjdk8 to a fixed version
-BUILD_CFLAGS_append = " -Wno-error=stringop-overflow"
-TARGET_CFLAGS_append = " -Wno-error=stringop-overflow"
+ARM_INSTRUCTION_SET:armv4t = "ARM"
 
 # Enable zero mode for arm based builds, as normal hotspot fails to build
-PACKAGECONFIG_append_armv4 = " zero"
-PACKAGECONFIG_append_armv5 = " zero"
-PACKAGECONFIG_append_armv6 = " zero"
+PACKAGECONFIG:append:armv4 = " zero"
+PACKAGECONFIG:append:armv5 = " zero"
+PACKAGECONFIG:append:armv6 = " zero"
 
 OPENJDK_ARCH_PORT = "jdk8u"
-OPENJDK_ARCH_PORT_aarch64 = "aarch64-port"
-OPENJDK_ARCH_PORT_armv7a = "aarch32-port"
-OPENJDK_ARCH_PORT_armv7ve = "aarch32-port"
+OPENJDK_ARCH_PORT:aarch64 = "aarch64-port"
+OPENJDK_ARCH_PORT:armv7a = "aarch32-port"
+OPENJDK_ARCH_PORT:armv7ve = "aarch32-port"
 OPENJDK_HG_U = "jdk8u"
 
 # the aarch64 port moved, for more information see:
 # https://mail.openjdk.java.net/pipermail/aarch64-port-dev/2018-August/006265.html
-OPENJDK_HG_U_aarch64 = "jdk8u-shenandoah"
+OPENJDK_HG_U:aarch64 = "jdk8u-shenandoah"
 
 OPENJDK_HG_URL = "https://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}"