openjdk25: fix rpath for Zero build

[Tobias Nygren (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Mon Sep 7 16:27:49 2026 +0200
Changeset:	21beb3fe8bc423f4f4ddf63ca6c406f1755f0270

Modified Files:
	openjdk25/distinfo
	openjdk25/patches/patch-make_autoconf_flags-cflags.m4

Log Message:
openjdk25: fix rpath for Zero build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=21beb3fe8bc423f4f4ddf63ca6c406f1755f0270

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

diffstat:
 openjdk25/distinfo                                    | 2 +-
 openjdk25/patches/patch-make_autoconf_flags-cflags.m4 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/openjdk25/distinfo b/openjdk25/distinfo
index e2a32fb873..15effff871 100644
--- a/openjdk25/distinfo
+++ b/openjdk25/distinfo
@@ -13,7 +13,7 @@ BLAKE2s (jdk25u-jdk-25.0.4-7-1.tar.gz) = db81e919589070cbef63d5f4df43a690cb5119a
 SHA512 (jdk25u-jdk-25.0.4-7-1.tar.gz) = ac564673ce14b192f3136d3d92e6125d412f1f449b3fcbe1f47dd0af7a6ccf6ec4a8f4c5074dcab17faf09fc2df54e0430c1e28ea7b8e171169ad97f2213b3fe
 Size (jdk25u-jdk-25.0.4-7-1.tar.gz) = 119810522 bytes
 SHA1 (patch-make_autoconf_buildjdk-spec.gmk.template) = 050c1ac0eaa96240651555264eb0e25d5537ab04
-SHA1 (patch-make_autoconf_flags-cflags.m4) = 7b77e6688805e4c290b5a5948c054463225ccd2d
+SHA1 (patch-make_autoconf_flags-cflags.m4) = 863f94fc42117007d68cabf580689cdda194d5f7
 SHA1 (patch-make_autoconf_hotspot.m4) = 6097c29677f4b84c3821b5cf7ac8c397376027d0
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 5f5b638a08abf2f2066a122a825cfa3db9e95139
diff --git a/openjdk25/patches/patch-make_autoconf_flags-cflags.m4 b/openjdk25/patches/patch-make_autoconf_flags-cflags.m4
index c298130099..9b20cbe596 100644
--- a/openjdk25/patches/patch-make_autoconf_flags-cflags.m4
+++ b/openjdk25/patches/patch-make_autoconf_flags-cflags.m4
@@ -10,7 +10,7 @@ We prefer to use explicit run paths.
      # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
 -    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
 -    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/${JVM_VARIANT_MAIN}'
 +    SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
  
@@ -20,7 +20,7 @@ We prefer to use explicit run paths.
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
 -      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
-+      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/${JVM_VARIANT_MAIN}'
        if test "x$OPENJDK_TARGET_OS" = xlinux; then
          SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
        fi