head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.20
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.18
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.16
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.14
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.12
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.10
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.8
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.6
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.4
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.2
	pkgsrc-2023Q4-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2023.12.09.01.19.54;	author ryoon;	state Exp;
branches;
next	;
commitid	BY9aWJYSZ99gdJPE;


desc
@@


1.1
log
@openjdk11: Fix runtime error of Bazel

* Do not link libjli_static statically for BSD.
* Bump PKGREVISION.
@
text
@$NetBSD$

* 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
 
@