summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/2005-jdk-use-correct-include-for-signal.patch90
1 files changed, 90 insertions, 0 deletions
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 @@
1From 606c807be8e01a4cc99a02b50717d9bce141e8a2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Tue, 27 Feb 2018 09:28:06 +0000
4Subject: [PATCH 2005/2008] jdk: use correct include for signal
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Compiling against musl-libc gives the following warning (which is
10treated as error due to -Werror:
11| In file included from jdk/src/solaris/javavm/export/jvm_md.h:68:0,
12| from jdk/src/share/javavm/export/jvm.h:32,
13| from jdk/src/share/native/java/net/net_util.h:29,
14| from jdk/src/solaris/native/java/net/InetAddressImplFactory.c:28:
15| usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Wcpp]
16| #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
17| ^~~~~~~
18etc.
19
20As per the message, signal.h needs to be included instead - do so using
21the following command:
22 for i in $(git grep sys/signal\.h jdk | cut -f 1 -d : | sort -u) ; do
23 sed -e 's,sys/signal\.h,signal.h,g' -i ${i}
24 done
25
26Upstream-Status: Pending
27Signed-off-by: André Draszik <andre.draszik@jci.com>
28Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
29---
30 src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +-
31 src/macosx/javavm/export/jvm_md.h | 2 +-
32 src/solaris/javavm/export/jvm_md.h | 2 +-
33 src/solaris/native/sun/nio/ch/NativeThread.c | 2 +-
34 4 files changed, 4 insertions(+), 4 deletions(-)
35
36diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
37index c0d585796..c4abb7ae5 100644
38--- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
39+++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
40@@ -32,7 +32,7 @@
41 #include "sun_nio_ch_NativeThread.h"
42
43 #include <pthread.h>
44-#include <sys/signal.h>
45+#include <signal.h>
46
47 /* Also defined in src/aix/native/java/net/aix_close.c */
48 #define INTERRUPT_SIGNAL (SIGRTMAX - 1)
49diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h
50index 012bb1bab..0b5757683 100644
51--- a/jdk/src/macosx/javavm/export/jvm_md.h
52+++ b/jdk/src/macosx/javavm/export/jvm_md.h
53@@ -60,7 +60,7 @@
54 #include <sys/stat.h>
55 #include <fcntl.h>
56 #include <errno.h>
57-#include <sys/signal.h>
58+#include <signal.h>
59
60 /* O Flags */
61
62diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h
63index 5c681914b..62415ee25 100644
64--- a/jdk/src/solaris/javavm/export/jvm_md.h
65+++ b/jdk/src/solaris/javavm/export/jvm_md.h
66@@ -65,7 +65,7 @@
67 #include <sys/stat.h>
68 #include <fcntl.h>
69 #include <errno.h>
70-#include <sys/signal.h>
71+#include <signal.h>
72
73 /* O Flags */
74
75diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
76index 5e2a78b7a..204f0441a 100644
77--- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
78+++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
79@@ -34,7 +34,7 @@
80
81 #ifdef __linux__
82 #include <pthread.h>
83- #include <sys/signal.h>
84+ #include <signal.h>
85 /* Also defined in net/linux_close.c */
86 #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
87 #elif __solaris__
88--
892.24.1
90