diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-06 11:01:53 +0200 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-06 11:03:09 +0200 |
commit | 3668ba76f44bc778ba4446236088c22948a644d0 (patch) | |
tree | cc3291774f0e41350f22a1e5e0196e08f14500a3 /recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | |
parent | f8be3065f7c5dbd73516394c0bcd2c7ba1777abf (diff) | |
download | meta-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/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch b/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch new file mode 100644 index 0000000..81dbebd --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 4ed4b58270dcd3d897adef605893c104944c4f3a Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
3 | Date: Tue, 27 Feb 2018 15:00:55 +0000 | ||
4 | Subject: [PATCH 6/9] hotspot: don't rely on old SysV SIGCLD | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | SIGCLD is the old System V name for SIGCHLD, and not | ||
10 | all c libraries implement it, e.g. musl-libc, which | ||
11 | leads to the following compilation error: | ||
12 | |||
13 | | hotspot/src/os/linux/vm/jvm_linux.cpp:157:17: error: 'SIGCLD' was not declared in this scope | ||
14 | | "CLD", SIGCLD, /* Same as SIGCHLD (System V). */ | ||
15 | | ^~~~~~ | ||
16 | |||
17 | Just make it conditional, so the code compiles everywhere. | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
21 | --- | ||
22 | hotspot/src/os/linux/vm/jvm_linux.cpp | 2 ++ | ||
23 | 1 file changed, 2 insertions(+) | ||
24 | |||
25 | diff --git a/hotspot/src/os/linux/vm/jvm_linux.cpp b/hotspot/src/os/linux/vm/jvm_linux.cpp | ||
26 | index ba84788a..c22281f7 100644 | ||
27 | --- a/hotspot/src/os/linux/vm/jvm_linux.cpp | ||
28 | +++ b/hotspot/src/os/linux/vm/jvm_linux.cpp | ||
29 | @@ -154,7 +154,9 @@ struct siglabel siglabels[] = { | ||
30 | #ifdef SIGSTKFLT | ||
31 | "STKFLT", SIGSTKFLT, /* Stack fault. */ | ||
32 | #endif | ||
33 | +#ifdef SIGCLD | ||
34 | "CLD", SIGCLD, /* Same as SIGCHLD (System V). */ | ||
35 | +#endif | ||
36 | "CHLD", SIGCHLD, /* Child status has changed (POSIX). */ | ||
37 | "CONT", SIGCONT, /* Continue (POSIX). */ | ||
38 | "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */ | ||
39 | -- | ||
40 | 2.16.2 | ||
41 | |||