aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Leitner <richard.leitner@skidata.com>2020-11-02 12:22:20 +0100
committerRichard Leitner <richard.leitner@skidata.com>2020-11-09 14:35:48 +0100
commit7be4ddd753916403be46754fe5e1465ac0c08acc (patch)
treefaa5409816b275359e086a54b02dd9f82e8f3d2b
parent609b90efb763d1d896ab96202d00e2f51df64ff2 (diff)
downloadmeta-java-warrior.tar.gz
meta-java-warrior.tar.bz2
meta-java-warrior.zip
icedtea-7: add fix for deprecated sys/sysctl.h includewarrior
As glibc deprecated sys/sysctl.h we use linux/sysctl.h for now. Signed-off-by: Richard Leitner <richard.leitner@skidata.com> Cherry-picked-from: 9c61ac937e5c54e3ef34d41dda8f635209ac52b7
-rw-r--r--recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch22
-rw-r--r--recipes-core/icedtea/openjdk-7-release-03b147.inc2
2 files changed, 24 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch
new file mode 100644
index 0000000..1c7a585
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch
@@ -0,0 +1,22 @@
+--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+@@ -35,7 +35,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #include <sys/utsname.h>
+ #include <netinet/ip.h>
+
+--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+@@ -43,7 +43,7 @@
+ #endif
+ #ifdef __linux__
+ #include <unistd.h>
+-#include <sys/sysctl.h>
++#include <linux/sysctl.h>
+ #endif
+
+ #include "jvm.h"
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc
index 9816c0c..9189fcc 100644
--- a/recipes-core/icedtea/openjdk-7-release-03b147.inc
+++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc
@@ -93,6 +93,7 @@ OPENJDK_PATCHES = " \
file://icedtea-jdk-unzip.patch;apply=no \
file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \
file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \
+ file://icedtea-jdk-replace-sys-sysctl.patch;apply=no \
"
OPENJDK_HEADLESS_PATCHES = " \
@@ -118,6 +119,7 @@ export DISTRIBUTION_PATCHES = " \
patches/icedtea-jdk-unzip.patch \
patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \
patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \
+ patches/icedtea-jdk-replace-sys-sysctl.patch \
${CLEAN_X11_DISTRIBUTION_PATCH} \
"