From cb6eedeb1f7fa877497e6ff2aa893e8089fe6541 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Mon, 30 Dec 2019 15:35:59 +0100 Subject: openjdk-8: update to latest ga version 242 As OpenJDK-8 is now tagging "ga" versions in addition to the "build" version the recipes are adapted to use those "ga" versions. All existing patches got re-applied and renamed. For better handling Hotspot patches now start at patch number 1001 and jdk patches at 2001. Furthermore architecture dependent patches are prefixed with the architecture they apply on. Following patches/hunks were completely dropped: - 0002-hotspot-fix-compilation-with-security-flags-enabled.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/c40a28e54185 - 0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch ostream.cpp:112 got fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f3108e56b502 - 0014-hotspot-zero-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/ca4663e58916 - 0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/32bc598624bd - 0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c - openjdk8-add-missing-linker-flags.patch fixed in hotspot jdk8u https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/f175513c2c3a - openjdk8-fix-shark-stdc++11.patch fixed in hotspot jdk8u - openjdk8-fix-libpng-neon-build.patch fixed in jdk https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/5d57817931e1 - aarch64-hotspot-fix-undefined-behaviour-gcc-v8-fix.patch got backported to hotspot jdk8u Following patches were newly added: - 0011-autoconf-fix-CC-with-arguments-detection.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" - 0012-autoconf-NativeCompilation-remove-sysroot.patch needed because of jdk8u commit "8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris" Signed-off-by: Richard Leitner --- .../2005-jdk-use-correct-include-for-signal.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch (limited to 'recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch') diff --git a/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch new file mode 100644 index 0000000..32bde99 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch @@ -0,0 +1,90 @@ +From 606c807be8e01a4cc99a02b50717d9bce141e8a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Tue, 27 Feb 2018 09:28:06 +0000 +Subject: [PATCH 2005/2008] jdk: use correct include for signal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compiling against musl-libc gives the following warning (which is +treated as error due to -Werror: +| In file included from jdk/src/solaris/javavm/export/jvm_md.h:68:0, +| from jdk/src/share/javavm/export/jvm.h:32, +| from jdk/src/share/native/java/net/net_util.h:29, +| from jdk/src/solaris/native/java/net/InetAddressImplFactory.c:28: +| usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] +| #warning redirecting incorrect #include to +| ^~~~~~~ +etc. + +As per the message, signal.h needs to be included instead - do so using +the following command: + for i in $(git grep sys/signal\.h jdk | cut -f 1 -d : | sort -u) ; do + sed -e 's,sys/signal\.h,signal.h,g' -i ${i} + done + +Upstream-Status: Pending +Signed-off-by: André Draszik +Signed-off-by: Richard Leitner +--- + src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +- + src/macosx/javavm/export/jvm_md.h | 2 +- + src/solaris/javavm/export/jvm_md.h | 2 +- + src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c +index c0d585796..c4abb7ae5 100644 +--- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c ++++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c +@@ -32,7 +32,7 @@ + #include "sun_nio_ch_NativeThread.h" + + #include +-#include ++#include + + /* Also defined in src/aix/native/java/net/aix_close.c */ + #define INTERRUPT_SIGNAL (SIGRTMAX - 1) +diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h +index 012bb1bab..0b5757683 100644 +--- a/jdk/src/macosx/javavm/export/jvm_md.h ++++ b/jdk/src/macosx/javavm/export/jvm_md.h +@@ -60,7 +60,7 @@ + #include + #include + #include +-#include ++#include + + /* O Flags */ + +diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h +index 5c681914b..62415ee25 100644 +--- a/jdk/src/solaris/javavm/export/jvm_md.h ++++ b/jdk/src/solaris/javavm/export/jvm_md.h +@@ -65,7 +65,7 @@ + #include + #include + #include +-#include ++#include + + /* O Flags */ + +diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +index 5e2a78b7a..204f0441a 100644 +--- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c ++++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +@@ -34,7 +34,7 @@ + + #ifdef __linux__ + #include +- #include ++ #include + /* Also defined in net/linux_close.c */ + #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) + #elif __solaris__ +-- +2.24.1 + -- cgit v1.2.3-54-g00ecf