CVS commit: pkgsrc/lang/openjdk17

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Nov 26 10:48:46 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk17: distinfo
Added Files:
        pkgsrc/lang/openjdk17/patches:
            patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp

Log Message:
openjdk17: fix mis-merge


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp

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

Modified files:

Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.14 pkgsrc/lang/openjdk17/distinfo:1.15
--- pkgsrc/lang/openjdk17/distinfo:1.14 Thu Nov 23 15:34:02 2023
+++ pkgsrc/lang/openjdk17/distinfo      Sun Nov 26 10:48:46 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2023/11/23 15:34:02 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2023/11/26 10:48:46 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = b632092d25292e795a2d7567ec55d03f21021dbba27eab3e81a48aed5e5bdd68
 SHA512 (bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz) = fb86749d56be94cc1509f92d8fbdec481b0c7f6fdd5e731826098e6eaa668539052571ffd09125346c1920262b07857ea675799ab8476fcff53c03e158536c1d
@@ -24,5 +24,6 @@ SHA1 (patch-make_autoconf_lib-freetype.m
 SHA1 (patch-make_autoconf_lib-x11.m4) = 38038e6d7cfc2d15fb3537a52f11d2961cc2ec99
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 3172d8d76e0e79b127605429fb70dccd164b33c8
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = d69fa8c5cab173be2f41cfbd6479dad60a6337db
+SHA1 (patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp) = e11966bd092ab88a2dd1fd96203853871aae1365
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = 5561ed502aa925cd3d0514c7ec298e0491d14ffc
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = d7bd8839ecd84459fbd3e7d14ac0e2f48b8b4032

Added files:

Index: pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp
diff -u /dev/null pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp:1.3
--- /dev/null   Sun Nov 26 10:48:46 2023
+++ pkgsrc/lang/openjdk17/patches/patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp   Sun Nov 26 10:48:46 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_hotspot_os__cpu_bsd__aarch64_os__bsd__aarch64.cpp,v 1.3 2023/11/26 10:48:46 tnn Exp $
+
+Fix mis-merge.
+
+--- src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp.orig     2023-11-26 10:38:45.728534591 +0000
++++ src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+@@ -962,6 +962,7 @@ void os::print_context(outputStream *st,
+ #endif
+   }
+   st->cr();
++}
+ 
+ void os::print_tos_pc(outputStream *st, const void *context) {
+   if (context == NULL) return;