pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openjdk25: fix patch so it doesn't nuke /usr/sbin/paxctl (oops)



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sat Sep 5 04:02:47 2026 +0200
Changeset:	0403091c9507e44b8a8b5d99ae4fbe2e30d4fa79

Modified Files:
	openjdk25/distinfo
	openjdk25/patches/patch-make_common_native_Link.gmk

Log Message:
openjdk25: fix patch so it doesn't nuke /usr/sbin/paxctl (oops)

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

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_common_native_Link.gmk | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/openjdk25/distinfo b/openjdk25/distinfo
index 3d7904d35a..febe79b7e9 100644
--- a/openjdk25/distinfo
+++ b/openjdk25/distinfo
@@ -10,7 +10,7 @@ SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c38
 SHA1 (patch-make_autoconf_lib-bundled.m4) = 5f5b638a08abf2f2066a122a825cfa3db9e95139
 SHA1 (patch-make_autoconf_lib-freetype.m4) = bd791b99e4fd87f24432831fba1e814dd199445f
 SHA1 (patch-make_autoconf_lib-x11.m4) = 38038e6d7cfc2d15fb3537a52f11d2961cc2ec99
-SHA1 (patch-make_common_native_Link.gmk) = 394f81d341fa8a2c1d5325eb867e3dd18ef810f5
+SHA1 (patch-make_common_native_Link.gmk) = b453202c240959e42f1a1ba6dc84ce6c9f3a5dcc
 SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp) = 989bd899a7a65ad0e498dc9a4b377cd3f511d4d8
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
 SHA1 (patch-src_java.desktop_bsd_data_fontconfig_fontconfig.properties) = 32eda43f536dc3a9afb4f1f5f7acae8cb020d546
diff --git a/openjdk25/patches/patch-make_common_native_Link.gmk b/openjdk25/patches/patch-make_common_native_Link.gmk
index 0f9846948c..5e470ea47b 100644
--- a/openjdk25/patches/patch-make_common_native_Link.gmk
+++ b/openjdk25/patches/patch-make_common_native_Link.gmk
@@ -2,14 +2,14 @@ $NetBSD$
 
 Fix mismerged NetBSD patch (missing hard TAB).
 
---- make/common/native/Link.gmk.orig	2026-09-04 22:33:36.044154183 +0000
+--- make/common/native/Link.gmk.orig	2026-07-24 17:22:09.000000000 +0000
 +++ make/common/native/Link.gmk
 @@ -195,7 +195,7 @@ define CreateDynamicLibraryOrExecutable
            endif
          endif
          ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd)
 -          /usr/sbin/paxctl +m $$@
-+	  $$(call ExecuteWithLog, /usr/sbin/paxctl +m $$@)
++	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_paxctl, /usr/sbin/paxctl +m $$@)
          endif
          ifneq ($(MACOSX_CODESIGN_MODE), disabled)
            # Remove signature explicitly first to avoid warnings if the linker


Home | Main Index | Thread Index | Old Index