summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.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/0005-hotspot-use-correct-include-for-poll.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/0005-hotspot-use-correct-include-for-poll.patch')
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch b/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch
new file mode 100644
index 0000000..8b3420e
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0005-hotspot-use-correct-include-for-poll.patch
@@ -0,0 +1,85 @@
1From 79e35bd203b40979e1d241a04d6d9df373327bef 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 5/9] hotspot: use correct include for poll
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.../recipe-sysroot/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Werror=cpp]
12 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
13 ^~~~~~~
14etc.
15
16To use poll(), poll.h needs to be included, even on glibc - do so using
17the following command:
18 for i in $(git grep sys/poll\.h hotspot | cut -f 1 -d : | sort -u) ; do
19 sed -e 's,sys/poll\.h,poll.h,g' -i ${i}
20 done
21
22Upstream-Status: Pending
23Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>>
24---
25 hotspot/src/os/aix/vm/os_aix.inline.hpp | 2 +-
26 hotspot/src/os/bsd/vm/os_bsd.inline.hpp | 2 +-
27 hotspot/src/os/linux/vm/os_linux.inline.hpp | 2 +-
28 hotspot/src/os/solaris/vm/os_solaris.inline.hpp | 2 +-
29 4 files changed, 4 insertions(+), 4 deletions(-)
30
31diff --git a/hotspot/src/os/aix/vm/os_aix.inline.hpp b/hotspot/src/os/aix/vm/os_aix.inline.hpp
32index a97c94c0..e2974ee1 100644
33--- a/hotspot/src/os/aix/vm/os_aix.inline.hpp
34+++ b/hotspot/src/os/aix/vm/os_aix.inline.hpp
35@@ -34,7 +34,7 @@
36
37 #include <unistd.h>
38 #include <sys/socket.h>
39-#include <sys/poll.h>
40+#include <poll.h>
41 #include <sys/ioctl.h>
42 #include <netdb.h>
43
44diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
45index 10b39941..3144a29c 100644
46--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
47+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
48@@ -33,7 +33,7 @@
49
50 #include <unistd.h>
51 #include <sys/socket.h>
52-#include <sys/poll.h>
53+#include <poll.h>
54 #include <netdb.h>
55
56 inline void* os::thread_local_storage_at(int index) {
57diff --git a/hotspot/src/os/linux/vm/os_linux.inline.hpp b/hotspot/src/os/linux/vm/os_linux.inline.hpp
58index 10d56d89..b9b2b775 100644
59--- a/hotspot/src/os/linux/vm/os_linux.inline.hpp
60+++ b/hotspot/src/os/linux/vm/os_linux.inline.hpp
61@@ -33,7 +33,7 @@
62
63 #include <unistd.h>
64 #include <sys/socket.h>
65-#include <sys/poll.h>
66+#include <poll.h>
67 #include <netdb.h>
68
69 inline void* os::thread_local_storage_at(int index) {
70diff --git a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
71index 921fcf7c..5d80a7d0 100644
72--- a/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
73+++ b/hotspot/src/os/solaris/vm/os_solaris.inline.hpp
74@@ -33,7 +33,7 @@
75 #include <sys/param.h>
76 #include <dlfcn.h>
77 #include <sys/socket.h>
78-#include <sys/poll.h>
79+#include <poll.h>
80 #include <sys/filio.h>
81 #include <unistd.h>
82 #include <netdb.h>
83--
842.16.2
85