openjdk8: Re-fix SunOS support.

3 files changed, 59 insertions, 11 deletions

diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index 3a814b8b6e7..ca587c81857 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2018/12/12 16:04:10 ryoon Exp $
+$NetBSD: distinfo,v 1.65 2018/12/15 20:27:45 jperkin Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -63,7 +63,7 @@ SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63
 SHA1 (patch-bi) = 5409f0944d6f850baeaaa7c64d2e8ad52233e1e9
 SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892
 SHA1 (patch-common_autoconf_boot-jdk.m4) = a29767c79544dea243019cc841d834f756172462
-SHA1 (patch-common_autoconf_generated-configure.sh) = bd10cdd8d06c6620cf350df8b5a0e6dd392ef058
+SHA1 (patch-common_autoconf_generated-configure.sh) = bb925091b859f6feea7963b9d99d3c7d6654982f
 SHA1 (patch-common_autoconf_spec.gmk.in) = e98bc4c8a09f49c6a26447e6f78abf4709ee694b
 SHA1 (patch-hotspot_agent_src_os_bsd_Makefile) = 6e4c41b080577ed7cd418ee3b84f7f5a73dd11e6
 SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928
@@ -121,6 +121,7 @@ SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d
 SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
+SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = bd2ef7ea0b2cd9ec8cb637e0c0d4dc3a25021773
 SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
 SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
diff --git a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
index a6fbf0dfbe2..b4f25044327 100644
--- a/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
+++ b/lang/openjdk8/patches/patch-common_autoconf_generated-configure.sh
@@ -1,10 +1,19 @@
-$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.15 2018/12/12 14:22:11 ryoon Exp $
+$NetBSD: patch-common_autoconf_generated-configure.sh,v 1.16 2018/12/15 20:27:45 jperkin Exp $
 
 BOOT_JDK_VERSION part: pkg/51221 (Build error with OpenJDK8 and i386) and
 pkg/53223.
 
 --- common/autoconf/generated-configure.sh.orig	2018-12-09 09:50:43.000000000 +0000
 +++ common/autoconf/generated-configure.sh
+@@ -4132,7 +4132,7 @@ VALID_TOOLCHAINS_all="gcc clang solstudi
+ # These toolchains are valid on different platforms
+ VALID_TOOLCHAINS_bsd="clang gcc"
+ VALID_TOOLCHAINS_linux="gcc clang"
+-VALID_TOOLCHAINS_solaris="solstudio"
++VALID_TOOLCHAINS_solaris="gcc solstudio"
+ VALID_TOOLCHAINS_macosx="gcc clang"
+ VALID_TOOLCHAINS_aix="xlc"
+ VALID_TOOLCHAINS_windows="microsoft"
 @@ -15404,9 +15404,6 @@ done
    # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
    if test "x$MAKE" != x; then
@@ -222,7 +231,7 @@ pkg/53223.
  
              # Extra M4 quote needed to protect [] in grep expression.
              FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`
-@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk 
+@@ -24796,16 +24793,15 @@ $as_echo_n "checking flags for boot jdk
    # Maximum amount of heap memory.
    # Maximum stack size.
    if test "x$BOOT_JDK_BITS" = x32; then
@@ -276,7 +285,30 @@ pkg/53223.
            # This is not a symbolic link! We are done!
            break
          fi
-@@ -42453,7 +42449,8 @@ $as_echo "alsa pulse x11" >&6; }
+@@ -41214,6 +41210,12 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
+       SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1'
+       SET_SHARED_LIBRARY_MAPFILE=''
++    elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
++      SHARED_LIBRARY_FLAGS="-shared"
++      SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN$1'
++      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
++      SET_SHARED_LIBRARY_NAME=''
++      SET_SHARED_LIBRARY_MAPFILE=''
+     else
+       # Default works for linux, might work on other platforms as well.
+       SHARED_LIBRARY_FLAGS='-shared'
+@@ -41262,7 +41264,9 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
+   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+     CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
+     CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
++    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+     CFLAGS_JDKLIB_EXTRA='-xstrconst'
++    fi
+   fi
+   # The (cross) compiler is now configured, we can now test capabilities
+   # of the target platform.
+@@ -42453,7 +42457,8 @@ $as_echo "alsa pulse x11" >&6; }
    if test "x$OPENJDK_TARGET_OS" = xbsd; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5
  $as_echo_n "checking what is not needed on BSD?... " >&6; }
@@ -286,7 +318,7 @@ pkg/53223.
        ALSA_NOT_NEEDED=yes
        PULSE_NOT_NEEDED=yes
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5
-@@ -43683,7 +43680,7 @@ $as_echo "$as_me: WARNING: Can't find pr
+@@ -43683,7 +43688,7 @@ $as_echo "$as_me: WARNING: Can't find pr
      BUILD_FREETYPE=no
    fi
    # Now check if configure found a version of 'msbuild.exe'
@@ -295,7 +327,7 @@ pkg/53223.
      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&5
  $as_echo "$as_me: WARNING: Can't find an msbuild.exe executable (you may try to install .NET 4.0) - ignoring --with-freetype-src" >&2;}
      BUILD_FREETYPE=no
-@@ -44099,7 +44096,11 @@ $as_echo "$as_me: WARNING: --with-freety
+@@ -44099,7 +44104,11 @@ $as_echo "$as_me: WARNING: --with-freety
  
        # Allow --with-freetype-lib and --with-freetype-include to override
        if test "x$with_freetype_include" != x; then
@@ -308,7 +340,7 @@ pkg/53223.
        fi
        if test "x$with_freetype_lib" != x; then
          POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib"
-@@ -47209,7 +47210,7 @@ $as_echo "$as_me: The path of FREETYPE_I
+@@ -47209,7 +47218,7 @@ $as_echo "$as_me: The path of FREETYPE_I
      FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
    fi
  
@@ -317,7 +349,7 @@ pkg/53223.
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH"
        else
          FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH"
-@@ -47342,7 +47343,7 @@ $as_echo "$as_me: The path of FREETYPE_L
+@@ -47342,7 +47351,7 @@ $as_echo "$as_me: The path of FREETYPE_L
        if test "x$OPENJDK_TARGET_OS" = xwindows; then
          FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib"
        else
@@ -326,7 +358,7 @@ pkg/53223.
        fi
      fi
  
-@@ -48571,9 +48572,6 @@ fi
+@@ -48571,9 +48580,6 @@ fi
  
  
  
@@ -336,7 +368,7 @@ pkg/53223.
  
      llvm_components="jit mcjit engine nativecodegen native"
      unset LLVM_CFLAGS
-@@ -48616,7 +48614,7 @@ fi
+@@ -48616,7 +48622,7 @@ fi
    fi
  
    # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
diff --git a/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h
new file mode 100644
index 00000000000..787a43102b1
--- /dev/null
+++ b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h,v 1.3 2018/12/15 20:27:45 jperkin Exp $
+
+Set _POSIX_SOURCE correctly.
+
+--- jdk/src/share/native/sun/awt/libpng/pngpriv.h.orig	2018-12-09 09:51:37.000000000 +0000
++++ jdk/src/share/native/sun/awt/libpng/pngpriv.h
+@@ -63,7 +63,7 @@
+  * Windows/Visual Studio) there is no effect; the OS specific tests below are
+  * still required (as of 2011-05-02.)
+  */
+-#ifndef _POSIX_SOURCE
++#if (!defined(__sun) || (__STDC_VERSION__-0 < 199901L)) && !defined(_POSIX_SOURCE)
+ # define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
+ #endif
+