From 7f658075e4d275e9db11795d2d8be07d16239de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 16 Jan 2021 09:57:06 +0100 Subject: [PATCH] openjdk7-bootstrap: fix build w/ glibc-2.32 --- .../files/dist_patches_glibc.txt | 1 + .../files/icedtea-jdk-sysctl_h.patch | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch diff --git a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt index a9cf2cbeab5..c76c5685544 100644 --- a/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt +++ b/srcpkgs/openjdk7-bootstrap/files/dist_patches_glibc.txt @@ -4,4 +4,5 @@ icedtea-jdk-execinfo.patch icedtea-jdk-fix-ipv6-init.patch icedtea-jdk-no-soname.patch icedtea-jdk-xattr.patch +icedtea-jdk-sysctl_h.patch icedtea-cpio.patch diff --git a/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch b/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch new file mode 100644 index 00000000000..7cfaecdb185 --- /dev/null +++ b/srcpkgs/openjdk7-bootstrap/files/icedtea-jdk-sysctl_h.patch @@ -0,0 +1,55 @@ +--- openjdk.orig/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2019-04-16 05:24:16.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2021-01-16 09:43:09.253748103 +0100 +@@ -33,7 +33,7 @@ + #include + #include + #if defined(_ALLBSD_SOURCE) +-#include ++#include + #ifdef __APPLE__ + #include + #include +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2019-04-16 05:24:16.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2021-01-16 09:43:09.253748103 +0100 +@@ -41,7 +41,7 @@ + #endif + #ifdef __linux__ + #include +-#include ++#include + #include + #include + +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2019-04-16 05:24:16.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2021-01-16 09:43:09.252748056 +0100 +@@ -43,7 +43,7 @@ + #endif + #ifdef __linux__ + #include +-#include ++#include + #endif + + #include "jvm.h" +--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c 2019-04-16 05:24:16.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c 2021-01-16 09:43:09.252748056 +0100 +@@ -40,7 +40,7 @@ + #else + #include + #include +-#include ++#include + #ifndef MAXINT + #define MAXINT INT_MAX + #endif +--- openjdk.orig/jdk/src/solaris/native/sun/net/portconfig.c 2019-04-16 05:24:16.000000000 +0200 ++++ openjdk/jdk/src/solaris/native/sun/net/portconfig.c 2021-01-16 09:43:09.252748056 +0100 +@@ -29,7 +29,7 @@ + #include + + #if defined(_ALLBSD_SOURCE) +-#include ++#include + #endif + + #include "jni.h"