From f1bcc4bce42045795274a1e87ff38fbee0808a6f Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Tue, 30 Aug 2016 00:00:10 +0200 Subject: community/openjdk8: rewrite to use icedtea and upgrade to 8.101.13 --- community/openjdk8/icedtea-jdk-musl.patch | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'community/openjdk8/icedtea-jdk-musl.patch') diff --git a/community/openjdk8/icedtea-jdk-musl.patch b/community/openjdk8/icedtea-jdk-musl.patch index 49a88d93fe..ae0f504350 100644 --- a/community/openjdk8/icedtea-jdk-musl.patch +++ b/community/openjdk8/icedtea-jdk-musl.patch @@ -1,5 +1,5 @@ ---- src/jdk.orig/src/share/native/com/sun/java/util/jar/pack/zip.cpp -+++ src/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 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp @@ -46,6 +46,8 @@ #include "zip.h" @@ -9,8 +9,8 @@ #ifdef NO_ZLIB inline bool jar::deflate_bytes(bytes& head, bytes& tail) { ---- src/jdk.orig/src/share/native/com/sun/java/util/jar/pack/zip.h -+++ src/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 ++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h @@ -23,9 +23,7 @@ * questions. */ @@ -22,8 +22,8 @@ struct unpacker; ---- src/jdk.orig/src/share/native/sun/awt/medialib/mlib_types.h -+++ src/jdk/src/share/native/sun/awt/medialib/mlib_types.h +--- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h ++++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h @@ -27,6 +27,7 @@ #ifndef MLIB_TYPES_H #define MLIB_TYPES_H @@ -32,8 +32,8 @@ #include #if defined(_MSC_VER) #include /* for FLT_MAX and DBL_MAX */ ---- src/jdk.orig/src/solaris/native/java/net/Inet4AddressImpl.c -+++ src/jdk/src/solaris/native/java/net/Inet4AddressImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c @@ -47,7 +47,7 @@ #include "java_net_Inet4AddressImpl.h" @@ -43,8 +43,8 @@ #define HAS_GLIBC_GETHOSTBY_R 1 #endif ---- src/jdk.orig/src/solaris/native/java/net/NetworkInterface.c -+++ src/jdk/src/solaris/native/java/net/NetworkInterface.c +--- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c ++++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c @@ -47,7 +47,6 @@ #ifdef __linux__ @@ -53,8 +53,8 @@ #include #include #endif ---- src/jdk.orig/src/solaris/native/java/net/PlainDatagramSocketImpl.c -+++ src/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c @@ -35,7 +35,6 @@ #endif #ifdef __linux__ @@ -63,8 +63,8 @@ #include #include ---- src/jdk.orig/src/solaris/native/java/net/PlainSocketImpl.c -+++ src/jdk/src/solaris/native/java/net/PlainSocketImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c @@ -43,7 +43,6 @@ #endif #ifdef __linux__ @@ -73,8 +73,8 @@ #endif #include "jvm.h" ---- src/jdk.orig/src/solaris/native/java/net/linux_close.c -+++ src/jdk/src/solaris/native/java/net/linux_close.c +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c @@ -56,7 +56,7 @@ /* * Signal to unblock thread @@ -94,8 +94,8 @@ sa.sa_handler = sig_wakeup; sa.sa_flags = 0; sigemptyset(&sa.sa_mask); ---- src/jdk.orig/src/solaris/native/sun/nio/ch/NativeThread.c -+++ src/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +--- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c ++++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c @@ -36,7 +36,7 @@ #include #include -- cgit v1.2.3