summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-03-06 11:01:53 +0200
committerMaxin B. John <maxin.john@intel.com>2018-03-06 11:03:09 +0200
commit3668ba76f44bc778ba4446236088c22948a644d0 (patch)
treecc3291774f0e41350f22a1e5e0196e08f14500a3 /recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch
parentf8be3065f7c5dbd73516394c0bcd2c7ba1777abf (diff)
downloadmeta-java-3668ba76f44bc778ba4446236088c22948a644d0.tar.gz
openjdk-8: fix musl build
Add various patches to make it work in musl. Some of them are generic enough to be applied for all builds, some need to be specific to musl. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch89
1 files changed, 89 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch b/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch
new file mode 100644
index 0000000..406de52
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0008-jdk-use-correct-include-for-signal.patch
@@ -0,0 +1,89 @@
1From a063ee68bc0dd7dbf9737df4ee191e98796f2f6a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>>
3Date: Tue, 27 Feb 2018 09:28:06 +0000
4Subject: [PATCH 8/9] 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 at jci.com <https://lists.yoctoproject.org/listinfo/yocto>>
28---
29 jdk/src/aix/native/sun/nio/ch/AixNativeThread.c | 2 +-
30 jdk/src/macosx/javavm/export/jvm_md.h | 2 +-
31 jdk/src/solaris/javavm/export/jvm_md.h | 2 +-
32 jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +-
33 4 files changed, 4 insertions(+), 4 deletions(-)
34
35diff --git a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
36index c0d58579..c4abb7ae 100644
37--- a/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
38+++ b/jdk/src/aix/native/sun/nio/ch/AixNativeThread.c
39@@ -32,7 +32,7 @@
40 #include "sun_nio_ch_NativeThread.h"
41
42 #include <pthread.h>
43-#include <sys/signal.h>
44+#include <signal.h>
45
46 /* Also defined in src/aix/native/java/net/aix_close.c */
47 #define INTERRUPT_SIGNAL (SIGRTMAX - 1)
48diff --git a/jdk/src/macosx/javavm/export/jvm_md.h b/jdk/src/macosx/javavm/export/jvm_md.h
49index 012bb1ba..0b575768 100644
50--- a/jdk/src/macosx/javavm/export/jvm_md.h
51+++ b/jdk/src/macosx/javavm/export/jvm_md.h
52@@ -60,7 +60,7 @@
53 #include <sys/stat.h>
54 #include <fcntl.h>
55 #include <errno.h>
56-#include <sys/signal.h>
57+#include <signal.h>
58
59 /* O Flags */
60
61diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h
62index 5c681914..62415ee2 100644
63--- a/jdk/src/solaris/javavm/export/jvm_md.h
64+++ b/jdk/src/solaris/javavm/export/jvm_md.h
65@@ -65,7 +65,7 @@
66 #include <sys/stat.h>
67 #include <fcntl.h>
68 #include <errno.h>
69-#include <sys/signal.h>
70+#include <signal.h>
71
72 /* O Flags */
73
74diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
75index 5e2a78b7..204f0441 100644
76--- a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
77+++ b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
78@@ -34,7 +34,7 @@
79
80 #ifdef __linux__
81 #include <pthread.h>
82- #include <sys/signal.h>
83+ #include <signal.h>
84 /* Also defined in net/linux_close.c */
85 #define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
86 #elif __solaris__
87--
882.16.2
89