diff options
Diffstat (limited to 'community/openjdk8/icedtea-jdk-musl.patch')
| -rw-r--r-- | community/openjdk8/icedtea-jdk-musl.patch | 53 |
1 files changed, 32 insertions, 21 deletions
diff --git a/community/openjdk8/icedtea-jdk-musl.patch b/community/openjdk8/icedtea-jdk-musl.patch index ae0f504350..7cbced1bf5 100644 --- a/community/openjdk8/icedtea-jdk-musl.patch +++ b/community/openjdk8/icedtea-jdk-musl.patch @@ -1,5 +1,6 @@ ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp +diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2017-02-06 11:23:47.041165210 +0000 @@ -46,6 +46,8 @@ #include "zip.h" @@ -9,8 +10,9 @@ #ifdef NO_ZLIB inline bool jar::deflate_bytes(bytes& head, bytes& tail) { ---- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h -+++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h +diff -ru openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h +--- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h 2017-02-06 11:23:47.047832009 +0000 @@ -23,9 +23,7 @@ * questions. */ @@ -22,8 +24,9 @@ struct unpacker; ---- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h -+++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h +diff -ru openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h +--- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h 2017-02-06 11:23:47.047832009 +0000 @@ -27,6 +27,7 @@ #ifndef MLIB_TYPES_H #define MLIB_TYPES_H @@ -32,8 +35,9 @@ #include <limits.h> #if defined(_MSC_VER) #include <float.h> /* for FLT_MAX and DBL_MAX */ ---- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c +diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2017-02-06 11:23:47.047832009 +0000 @@ -47,7 +47,7 @@ #include "java_net_Inet4AddressImpl.h" @@ -43,19 +47,22 @@ #define HAS_GLIBC_GETHOSTBY_R 1 #endif ---- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c -+++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c -@@ -47,7 +47,6 @@ +diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c +--- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c 2017-02-06 11:23:47.047832009 +0000 +@@ -46,7 +46,6 @@ - #ifdef __linux__ + #if defined(__linux__) #include <sys/ioctl.h> -#include <bits/ioctls.h> #include <sys/utsname.h> #include <stdio.h> #endif ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c -@@ -35,7 +35,6 @@ +Only in openjdk/jdk/src/solaris/native/java/net: NetworkInterface.c.orig +diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 +@@ -41,7 +41,6 @@ #endif #ifdef __linux__ #include <unistd.h> @@ -63,8 +70,10 @@ #include <sys/utsname.h> #include <netinet/ip.h> ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c +Only in openjdk/jdk/src/solaris/native/java/net: PlainDatagramSocketImpl.c.orig +diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 @@ -43,7 +43,6 @@ #endif #ifdef __linux__ @@ -73,8 +82,9 @@ #endif #include "jvm.h" ---- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c -+++ openjdk/jdk/src/solaris/native/java/net/linux_close.c +diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2017-02-06 11:23:47.047832009 +0000 @@ -56,7 +56,7 @@ /* * Signal to unblock thread @@ -94,8 +104,9 @@ sa.sa_handler = sig_wakeup; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); ---- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c -+++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2017-01-25 04:22:03.000000000 +0000 ++++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2017-02-06 11:23:47.051165409 +0000 @@ -36,7 +36,7 @@ #include <pthread.h> #include <sys/signal.h> |