CVS commit: pkgsrc/lang/openjdk8

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Feb 27 11:09:41 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk8: builtin.mk distinfo
        pkgsrc/lang/openjdk8/patches:
            patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
            patch-jdk_make_lib_CoreLibraries.gmk

Log Message:
openjdk8: Fix patch.

Some pkglint cleanup while here.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/openjdk8/builtin.mk
cvs rdiff -u -r1.94 -r1.95 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp \
    pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk8/builtin.mk
diff -u pkgsrc/lang/openjdk8/builtin.mk:1.5 pkgsrc/lang/openjdk8/builtin.mk:1.6
--- pkgsrc/lang/openjdk8/builtin.mk:1.5 Thu Feb 10 18:55:10 2022
+++ pkgsrc/lang/openjdk8/builtin.mk     Mon Feb 27 11:09:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2022/02/10 18:55:10 gutteridge Exp $
+# $NetBSD: builtin.mk,v 1.6 2023/02/27 11:09:40 jperkin Exp $
 
 BUILTIN_PKG:=  openjdk8
 
@@ -27,7 +27,7 @@ MAKEVARS+=            IS_BUILTIN.openjdk8
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.openjdk8) && \
-    !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS])
+    ${IS_BUILTIN.openjdk8:tl} == yes
 BUILTIN_VERSION.openjdk8!=     ${OJDK8} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/'
 BUILTIN_PKG.openjdk8=          openjdk8-${BUILTIN_VERSION.openjdk8}
 .endif
@@ -43,12 +43,12 @@ USE_BUILTIN.openjdk8=       no
 .  else
 USE_BUILTIN.openjdk8=  ${IS_BUILTIN.openjdk8}
 .    if defined(BUILTIN_PKG.openjdk8) && \
-       !empty(IS_BUILTIN.openjdk8:M[yY][eE][sS])
+       ${IS_BUILTIN.openjdk8:tl} == yes
 USE_BUILTIN.openjdk8=  yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.openjdk8}
-.        if !empty(USE_BUILTIN.openjdk8:M[yY][eE][sS])
+.        if ${USE_BUILTIN.openjdk8:tl} == yes
 USE_BUILTIN.openjdk8!=                                                 \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openjdk8:Q}; then       \
+       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openjdk8:Q}; then \
                ${ECHO} "yes";                                          \
        else                                                            \
                ${ECHO} "no";                                           \
@@ -65,12 +65,12 @@ MAKEVARS+=          USE_BUILTIN.openjdk8
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.openjdk8?=       no
-.if !empty(CHECK_BUILTIN.openjdk8:M[nN][oO])
+.if ${CHECK_BUILTIN.openjdk8:tl} == no
 #
 # Here we place code that depends on whether USE_BUILTIN.openjdk8 is
 # set to "yes" or "no".
 #
-.  if !empty(USE_BUILTIN.openjdk8:M[yY][eE][sS])
+.  if ${USE_BUILTIN.openjdk8:tl} == yes
 PKG_JAVA_HOME= ${OJDK8:H:H}
 .  endif
 .endif  # CHECK_BUILTIN.openjdk8

Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.94 pkgsrc/lang/openjdk8/distinfo:1.95
--- pkgsrc/lang/openjdk8/distinfo:1.94  Sat Feb 25 18:09:15 2023
+++ pkgsrc/lang/openjdk8/distinfo       Mon Feb 27 11:09:40 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2023/02/25 18:09:15 ryoon Exp $
+$NetBSD: distinfo,v 1.95 2023/02/27 11:09:40 jperkin Exp $
 
 BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = f425ea056cb5b06be950a38d3c6cc517e18a4fa6e9e9db010f380c63be6563a5
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 
664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb
@@ -44,7 +44,7 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__aar
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_os__bsd__aarch64.cpp) = 461717b25728884add18a8c68221ccea4ef81bbe
 SHA1 (patch-hotspot_src_os__cpu_bsd__aarch64_vm_vm__version__bsd__aarch64.cpp) = d6762bb2a9fe6e158ccf23f7d04aa0cba588e78e
 SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = f46713855507654be42707b1f80a779796929069
-SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 199f460df677b2c64412fe032d7ff60e9dbd6796
+SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 76422f12baa3a2f97226932beb371d4ed4f8fb7c
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 6a6b719a52408e88b27d3f2a5a41789dc15ef39d
@@ -70,7 +70,7 @@ SHA1 (patch-jdk_make_CreateJars.gmk) = 0
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
 SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = 1e29aaa4a4ce5bb104bdd8d8ba1b87f8ff09b8be
-SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 21a46be1c8247d528a2e0666ca9a40520327771a
+SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 1a04bb832cc4bf9d392f1a38d28f1c16dcfc3684
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_ServiceabilityLibraries.gmk) = ab0ed14a661412aeb91ecde4251883817ea3cad4
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393

Index: pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp
diff -u pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.5 pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.6
--- pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp:1.5   Sat Oct  8 11:20:07 2022
+++ pkgsrc/lang/openjdk8/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp       Mon Feb 27 11:09:40 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.5 2022/10/08 11:20:07 nia Exp $
+$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.6 2023/02/27 11:09:40 jperkin Exp $
 
 Fix building with GCC < 10.
-                                      ^
+
 --- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig        2022-07-31 16:21:00.000000000 +0000
 +++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
 @@ -450,7 +450,8 @@ extern "C" {
Index: pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
diff -u pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk:1.5 pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk:1.6
--- pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk:1.5       Fri Feb 23 14:43:49 2018
+++ pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk   Mon Feb 27 11:09:40 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.5 2018/02/23 14:43:49 fhajny Exp $
+$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.6 2023/02/27 11:09:40 jperkin Exp $
 
 Ensure we can find zlib.
 Proper libiconv link (and SunOS needs it too).
 
---- jdk/make/lib/CoreLibraries.gmk.orig        2017-11-28 00:13:34.000000000 +0000
+--- jdk/make/lib/CoreLibraries.gmk.orig        2023-01-22 21:06:41.000000000 +0000
 +++ jdk/make/lib/CoreLibraries.gmk
-@@ -253,12 +253,14 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+@@ -263,7 +263,7 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
  
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
@@ -14,14 +14,16 @@ Proper libiconv link (and SunOS needs it
    LIBZIP_EXCLUDES += zlib
  else
    ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
- endif
+@@ -544,6 +544,8 @@ endif
+ 
+ ##########################################################################################
  
 +LIBICONV := @COMPILER_RPATH_FLAG@@BUILDLINK_PREFIX.iconv@/lib -L@BUILDLINK_PREFIX.iconv@/lib -liconv
 +
- BUILD_LIBZIP_REORDER :=
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-@@ -550,7 +552,8 @@ $(eval $(call SetupNativeCompilation,BUI
+ ifeq ($(OPENJDK_TARGET_OS), bsd)
+   BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
+   ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+@@ -564,7 +566,8 @@ $(eval $(call SetupNativeCompilation,BUI
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \