[pkgsrc/trunk]: pkgsrc/lang/openjdk8 openjdk8: Fix build on SunOS with newer ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ec4ec6ffad7
branches:  trunk
changeset: 310795:5ec4ec6ffad7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 24 12:58:45 2018 +0000

description:
openjdk8: Fix build on SunOS with newer GCC.

diffstat:

 lang/openjdk8/Makefile                                                                 |   5 +-
 lang/openjdk8/distinfo                                                                 |   4 +-
 lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h              |  16 ++++++++
 lang/openjdk8/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c |  18 ++++++++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diffs (86 lines):

diff -r 9d25b7415442 -r 5ec4ec6ffad7 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Tue Jul 24 12:40:09 2018 +0000
+++ b/lang/openjdk8/Makefile    Tue Jul 24 12:58:45 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2018/07/07 11:48:18 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2018/07/24 12:58:45 jperkin Exp $
 
 DISTNAME=      openjdk-1.8.172-20180527
 PKGNAME=       openjdk8-1.8.172
@@ -104,8 +104,9 @@
 CONFIGURE_ENV+=        CXXFLAGS_JDK=${CXXFLAGS:Q}
 
 # Fix segfault under NetBSD/amd64 8.99 with GCC 6.4.0
-.if !empty(CC_VERSION:Mgcc-6.*)
+.if !empty(CC_VERSION:Mgcc-[67].*)
 CFLAGS+=       -fno-lifetime-dse
+CFLAGS+=       -fno-delete-null-pointer-checks
 .endif
 
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
diff -r 9d25b7415442 -r 5ec4ec6ffad7 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Tue Jul 24 12:40:09 2018 +0000
+++ b/lang/openjdk8/distinfo    Tue Jul 24 12:58:45 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2018/05/27 04:58:20 tsutsui Exp $
+$NetBSD: distinfo,v 1.57 2018/07/24 12:58: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
@@ -119,12 +119,14 @@
 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) = 56e6390ae8cfb09b55f0d240b99284cc7f1736b3
 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
 SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
 SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
 SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
+SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = 227457d22887347f718b7c28aa6b967378f55e81
 SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
 SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
diff -r 9d25b7415442 -r 5ec4ec6ffad7 lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h Tue Jul 24 12:58:45 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h,v 1.1 2018/07/24 12:58:45 jperkin Exp $
+
+Fix build on SunOS with C99.
+
+--- jdk/src/share/native/sun/awt/libpng/pngpriv.h.orig 2017-11-28 00:13:31.000000000 +0000
++++ jdk/src/share/native/sun/awt/libpng/pngpriv.h
+@@ -63,7 +63,9 @@
+  * Windows/Visual Studio) there is no effect; the OS specific tests below are
+  * still required (as of 2011-05-02.)
+  */
++#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L)
+ #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
++#endif
+ 
+ #ifndef PNG_VERSION_INFO_ONLY
+ /* Standard library headers not required by png.h: */
diff -r 9d25b7415442 -r 5ec4ec6ffad7 lang/openjdk8/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk8/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c    Tue Jul 24 12:58:45 2018 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c,v 1.1 2018/07/24 12:58:45 jperkin Exp $
+
+Fix build on SunOS with C99.
+
+--- jdk/src/solaris/native/com/sun/security/auth/module/Unix.c.orig    2018-05-26 23:58:28.000000000 +0000
++++ jdk/src/solaris/native/com/sun/security/auth/module/Unix.c
+@@ -24,7 +24,11 @@
+  */
+ 
+ #ifdef __solaris__
++#  if (__STDC_VERSION__ - 0 < 199901L)
+ #define _POSIX_C_SOURCE 199506L
++#  else
++#define _POSIX_PTHREAD_SEMANTICS
++#  endif
+ #endif
+ 
+ #include <jni.h>