CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Dec  9 01:19:54 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk11: Makefile distinfo
        pkgsrc/lang/openjdk11/patches: patch-make_autoconf_flags-cflags.m4
Added Files:
        pkgsrc/lang/openjdk11/patches: patch-make_launcher_LauncherCommon.gmk

Log Message:
openjdk11: Fix runtime error of Bazel

* Do not link libjli_static statically for BSD.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/openjdk11/patches/patch-make_launcher_LauncherCommon.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/openjdk11/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.59 pkgsrc/lang/openjdk11/Makefile:1.60
--- pkgsrc/lang/openjdk11/Makefile:1.59 Thu Nov 23 15:33:19 2023
+++ pkgsrc/lang/openjdk11/Makefile      Sat Dec  9 01:19:54 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2023/11/23 15:33:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2023/12/09 01:19:54 ryoon Exp $
 
 DISTNAME=      jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk11u

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.41 pkgsrc/lang/openjdk11/distinfo:1.42
--- pkgsrc/lang/openjdk11/distinfo:1.41 Mon Dec  4 01:08:16 2023
+++ pkgsrc/lang/openjdk11/distinfo      Sat Dec  9 01:19:54 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2023/12/04 01:08:16 tnn Exp $
+$NetBSD: distinfo,v 1.42 2023/12/09 01:19:54 ryoon Exp $
 
 BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
 SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = 
c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
@@ -17,13 +17,14 @@ SHA512 (jdk11u-jdk-11.0.21-9-1.tar.gz) =
 Size (jdk11u-jdk-11.0.21-9-1.tar.gz) = 116433451 bytes
 SHA1 (patch-make_autoconf_build-performance.m4) = d52cb5897e9fb6e3b0cdbe34641d8caa218b21b7
 SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
-SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
+SHA1 (patch-make_autoconf_flags-cflags.m4) = 29d1301ca7c0a0c92daa377cf58580f325a4eb07
 SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 35a4cdb3c4c3e4893b583cc73a0a79fda6f487e0
 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
+SHA1 (patch-make_launcher_LauncherCommon.gmk) = e306dac42c5bdd908775b78c80128c9a96781b06
 SHA1 (patch-src_hotspot_os__cpu_bsd__arm_bsd__arm__32.s) = 474a66abfb25030d4e32134816c14b157d1ebe6a
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 6322cbdda03dee528e89ac8b725f3df5e2165797
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a

Index: pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4
diff -u pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4:1.2 pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4:1.3
--- pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4:1.2       Sun Jun 27 08:53:54 2021
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_flags-cflags.m4   Sat Dec  9 01:19:54 2023
@@ -1,8 +1,9 @@
-$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.2 2021/06/27 08:53:54 tnn Exp $
+$NetBSD: patch-make_autoconf_flags-cflags.m4,v 1.3 2023/12/09 01:19:54 ryoon Exp $
 
 We prefer to use explicit run paths.
+Add lib/jli to link libjli.so dynamically. Fix runtime error of Bazel.
 
---- make/autoconf/flags-cflags.m4.orig 2021-04-24 02:47:22.000000000 +0000
+--- make/autoconf/flags-cflags.m4.orig 2023-10-18 04:30:34.000000000 +0000
 +++ make/autoconf/flags-cflags.m4
 @@ -39,8 +39,8 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
  
@@ -10,7 +11,7 @@ We prefer to use explicit run paths.
      SHARED_LIBRARY_FLAGS='-shared'
 -    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
 -    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
-+    SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server'
++    SET_EXECUTABLE_ORIGIN='@COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/server @COMPILER_RPATH_FLAG@@PREFIX@/java/@JAVA_NAME@/lib/jli'
 +    SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
      SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'

Added files:

Index: pkgsrc/lang/openjdk11/patches/patch-make_launcher_LauncherCommon.gmk
diff -u /dev/null pkgsrc/lang/openjdk11/patches/patch-make_launcher_LauncherCommon.gmk:1.1
--- /dev/null   Sat Dec  9 01:19:54 2023
+++ pkgsrc/lang/openjdk11/patches/patch-make_launcher_LauncherCommon.gmk        Sat Dec  9 01:19:54 2023
@@ -0,0 +1,42 @@
+$NetBSD: patch-make_launcher_LauncherCommon.gmk,v 1.1 2023/12/09 01:19:54 ryoon Exp $
+
+* Link libjli.so dynamically. Fix runtime error of Bazel.
+
+--- make/launcher/LauncherCommon.gmk.orig      2023-10-18 04:30:34.000000000 +0000
++++ make/launcher/LauncherCommon.gmk
+@@ -155,7 +155,7 @@ define SetupBuildLauncherBody
+         -framework ApplicationServices
+   endif
+ 
+-  ifneq ($(findstring $(OPENJDK_TARGET_OS), aix bsd), )
++  ifneq ($(findstring $(OPENJDK_TARGET_OS), aix), )
+     $1_LDFLAGS += -L$(SUPPORT_OUTPUTDIR)/native/java.base
+     $1_LIBS += -ljli_static
+   endif
+@@ -183,6 +183,8 @@ define SetupBuildLauncherBody
+           $$($1_LDFLAGS), \
+       LDFLAGS_linux := \
+           -L$(call FindLibDirForModule, java.base)/jli, \
++      LDFLAGS_bsd := \
++          -L$(call FindLibDirForModule, java.base)/jli, \
+       LDFLAGS_macosx := \
+           -L$(call FindLibDirForModule, java.base)/jli, \
+       LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
+@@ -190,7 +192,7 @@ define SetupBuildLauncherBody
+       LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \
+       LIBS_unix := $$($1_LIBS_unix), \
+       LIBS_linux := -lpthread -ljli $(LIBDL), \
+-      LIBS_bsd := -pthread, \
++      LIBS_bsd := -pthread -ljli, \
+       LIBS_macosx := -ljli, \
+       LIBS_solaris := -ljli -lthread $(LIBDL), \
+       LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
+@@ -208,7 +210,7 @@ define SetupBuildLauncherBody
+ 
+   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
+ 
+-  ifeq ($(call isTargetOs, aix bsd), true)
++  ifeq ($(call isTargetOs, aix), true)
+     $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static)
+   endif
+