logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

icedtea-jdk-musl.patch (4861B)

    

  1. 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
  2. --- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-06-12 20:14:44.000000000 +0000
  3. +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp	2014-07-15 07:19:52.186682096 +0000
  4. @@ -46,6 +46,8 @@
  5.  
  6.  #include "zip.h"
  7.  
  8. +#define uchar unsigned char
  9. +
  10.  #ifdef NO_ZLIB
  11.  
  12.  inline bool jar::deflate_bytes(bytes& head, bytes& tail) {
  13. 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
  14. --- openjdk.orig/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-06-12 20:14:44.000000000 +0000
  15. +++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/zip.h	2014-07-15 07:19:52.186682096 +0000
  16. @@ -23,9 +23,7 @@
  17.   * questions.
  18.   */
  19.  
  20. -#define ushort unsigned short
  21. -#define uint   unsigned int
  22. -#define uchar  unsigned char
  23. +#include <sys/types.h>
  24.  
  25.  struct unpacker;
  26.  
  27. 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
  28. --- openjdk.orig/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-06-12 20:14:44.000000000 +0000
  29. +++ openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h	2014-07-15 07:19:52.186682096 +0000
  30. @@ -27,6 +27,7 @@
  31.  #ifndef MLIB_TYPES_H
  32.  #define MLIB_TYPES_H
  33.  
  34. +#include <stddef.h>			/* for NULL */
  35.  #include <limits.h>
  36.  #if defined(_MSC_VER)
  37.  #include <float.h>                      /* for FLT_MAX and DBL_MAX */
  38. diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
  39. --- openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-06-12 20:14:44.000000000 +0000
  40. +++ openjdk/jdk/src/solaris/native/java/net/Inet4AddressImpl.c	2014-07-15 07:19:52.186682096 +0000
  41. @@ -47,7 +47,7 @@
  42.  
  43.  #include "java_net_Inet4AddressImpl.h"
  44.  
  45. -#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
  46. +#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
  47.  #define HAS_GLIBC_GETHOSTBY_R   1
  48.  #endif
  49.  
  50. diff -ru openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c
  51. --- openjdk.orig/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-06-12 20:14:44.000000000 +0000
  52. +++ openjdk/jdk/src/solaris/native/java/net/NetworkInterface.c	2014-07-15 07:19:52.186682096 +0000
  53. @@ -47,7 +47,6 @@
  54.  
  55.  #ifdef __linux__
  56.  #include <sys/ioctl.h>
  57. -#include <bits/ioctls.h>
  58.  #include <sys/utsname.h>
  59.  #include <stdio.h>
  60.  #endif
  61. diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
  62. --- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
  63. +++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
  64. @@ -35,7 +35,6 @@
  65.  #endif
  66.  #ifdef __linux__
  67.  #include <unistd.h>
  68. -#include <sys/sysctl.h>
  69.  #include <sys/utsname.h>
  70.  #include <netinet/ip.h>
  71.  
  72. diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
  73. --- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-06-12 20:14:44.000000000 +0000
  74. +++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c	2014-07-15 07:19:52.190015524 +0000
  75. @@ -43,7 +43,6 @@
  76.  #endif
  77.  #ifdef __linux__
  78.  #include <unistd.h>
  79. -#include <sys/sysctl.h>
  80.  #endif
  81.  
  82.  #include "jvm.h"
  83. diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
  84. --- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c	2014-06-12 20:14:44.000000000 +0000
  85. +++ openjdk/jdk/src/solaris/native/java/net/linux_close.c	2014-07-15 07:22:17.609355950 +0000
  86. @@ -75,7 +75,7 @@
  87.  #ifdef _AIX
  88.  static int sigWakeup = (SIGRTMAX - 1);
  89.  #else
  90. -static int sigWakeup = (__SIGRTMAX - 2);
  91. +static int sigWakeup;
  92.  #endif
  93.  
  94.  /*
  95. @@ -148,6 +148,9 @@
  96.      /*
  97.       * Setup the signal handler
  98.       */
  99. +#ifndef __AIX
  100. +    sigWakeup = SIGRTMAX - 2;
  101. +#endif
  102.      sa.sa_handler = sig_wakeup;
  103.      sa.sa_flags   = 0;
  104.      sigemptyset(&sa.sa_mask);
  105. diff -ru openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c
  106. --- openjdk.orig/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-06-12 20:14:44.000000000 +0000
  107. +++ openjdk/jdk/src/solaris/native/sun/nio/ch/NativeThread.c	2014-07-15 07:19:52.190015524 +0000
  108. @@ -38,7 +38,7 @@
  109.  #include <sys/signal.h>
  110.  
  111.  /* Also defined in src/solaris/native/java/net/linux_close.c */
  112. -#define INTERRUPT_SIGNAL (__SIGRTMAX - 2)
  113. +#define INTERRUPT_SIGNAL (SIGRTMAX - 2)
  114.  
  115.  static void
  116.  nullHandler(int sig)