diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-13 18:27:56 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (patch) | |
tree | 266dc2f2b85135c4a1877fc720b5504ff0d1801d /recipes-core | |
parent | bbddc403d6c81d87eed9c92cc6b97aa423ee0d71 (diff) | |
download | meta-java-a599da830cdfe8f50534a8b5d4b8b963b34bc045.tar.gz |
openjdk-8: add a glibc 2.32 compatibility patch
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-common.inc | 1 | ||||
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2010-Remove-usage-of-sys-sysctl.h.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc index 3e4a0cf..1d69812 100644 --- a/recipes-core/openjdk/openjdk-8-release-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-common.inc | |||
@@ -20,6 +20,7 @@ PATCHES_URI = "\ | |||
20 | file://2007-jdk-no-genx11-in-headless.patch \ | 20 | file://2007-jdk-no-genx11-in-headless.patch \ |
21 | file://2008-jdk-no-unused-deps.patch \ | 21 | file://2008-jdk-no-unused-deps.patch \ |
22 | file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \ | 22 | file://2009-jdk-use-gcc-instead-of-ld-to-link-genSocketOptionRegistry.patch \ |
23 | file://2010-Remove-usage-of-sys-sysctl.h.patch \ | ||
23 | " | 24 | " |
24 | HOTSPOT_UB_PATCH = "\ | 25 | HOTSPOT_UB_PATCH = "\ |
25 | file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ | 26 | file://1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch \ |
diff --git a/recipes-core/openjdk/patches-openjdk-8/2010-Remove-usage-of-sys-sysctl.h.patch b/recipes-core/openjdk/patches-openjdk-8/2010-Remove-usage-of-sys-sysctl.h.patch new file mode 100644 index 0000000..f6d7681 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/2010-Remove-usage-of-sys-sysctl.h.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 3ed9b4a109cf2f31b97ab8ba317d67886452523c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 13 Aug 2020 17:59:42 +0200 | ||
4 | Subject: [PATCH] Remove usage of sys/sysctl.h | ||
5 | |||
6 | This header has been removed in glibc 2.32, and isn't used for | ||
7 | anything. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | 1 - | ||
13 | jdk/src/solaris/native/java/net/PlainSocketImpl.c | 1 - | ||
14 | 2 files changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | ||
17 | index cd15654e..4d8abe03 100644 | ||
18 | --- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | ||
19 | +++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | ||
20 | @@ -41,7 +41,6 @@ | ||
21 | #endif | ||
22 | #ifdef __linux__ | ||
23 | #include <unistd.h> | ||
24 | -#include <sys/sysctl.h> | ||
25 | #include <sys/utsname.h> | ||
26 | #include <netinet/ip.h> | ||
27 | |||
28 | diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | ||
29 | index 170957e7..9aafbc09 100644 | ||
30 | --- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c | ||
31 | +++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c | ||
32 | @@ -43,7 +43,6 @@ | ||
33 | #endif | ||
34 | #ifdef __linux__ | ||
35 | #include <unistd.h> | ||
36 | -#include <sys/sysctl.h> | ||
37 | #endif | ||
38 | |||
39 | #include "jvm.h" | ||