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/musl-0009-jdk-musl-has-gethostby_r.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/musl-0009-jdk-musl-has-gethostby_r.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch b/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch new file mode 100644 index 0000000..c033b77 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/musl-0009-jdk-musl-has-gethostby_r.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 276fb5b2d57cf0257dc82e84d80213fe3eec6e34 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: Fri, 2 Mar 2018 13:57:22 +0000 | ||
4 | Subject: [PATCH 9/9] jdk: musl has gethostby_r() | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Fix the #ifdef to also allow use of it when using musl. | ||
10 | |||
11 | Patch taken from Alpine Linux: | ||
12 | https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 | ||
13 | |||
14 | Upstream-Status: Inappropriate [musl specific] | ||
15 | Signed-off-by: André Draszik <andre.draszik at jci.com <https://lists.yoctoproject.org/listinfo/yocto>> | ||
16 | --- | ||
17 | jdk/src/solaris/native/java/net/Inet4AddressImpl.c | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c | ||
21 | index ec4f97df..5c1af081 100644 | ||
22 | --- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c | ||
23 | +++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c | ||
24 | @@ -47,7 +47,7 @@ | ||
25 | |||
26 | #include "java_net_Inet4AddressImpl.h" | ||
27 | |||
28 | -#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104)) | ||
29 | +#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104)) | ||
30 | #define HAS_GLIBC_GETHOSTBY_R 1 | ||
31 | #endif | ||
32 | |||
33 | -- | ||
34 | 2.16.2 | ||
35 | |||