CVS commit: pkgsrc/devel/cmake

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sat Sep 30 08:52:52 UTC 2023

Modified Files:
        pkgsrc/devel/cmake: distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_kwsys_ProcessUNIX.c

Log Message:
cmake: use the right ps command to get child process info on NetBSD

CMake uses ps to pid get information on childs of a process
to recursivly kill the childs. Not having KWSYSPE_PS_COMMAND
set means that CMake won't try to kill the child processes.
Not checking for the __NetBSD__ define also causes NetBSD
Sparc to use the ps command for Solaris leading to run-time
breaks, see PR pkg/57272.
This change was suggested by Valry Ushakov on PR pkg/57272.


To generate a diff of this commit:
cvs rdiff -u -r1.220 -r1.221 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX.c

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

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.220 pkgsrc/devel/cmake/distinfo:1.221
--- pkgsrc/devel/cmake/distinfo:1.220   Thu Sep 21 13:54:15 2023
+++ pkgsrc/devel/cmake/distinfo Sat Sep 30 08:52:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.220 2023/09/21 13:54:15 gdt Exp $
+$NetBSD: distinfo,v 1.221 2023/09/30 08:52:52 nros Exp $
 
 BLAKE2s (cmake-3.27.6.tar.gz) = 53cb0cea7c0815cb244726fa345f4f57396af5127f7dfa31edf5c41875d1913b
 SHA512 (cmake-3.27.6.tar.gz) = 268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638
@@ -21,6 +21,7 @@ SHA1 (patch-Source_Checks_cm__cxx17__che
 SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
 SHA1 (patch-Source_cmSystemTools.cxx) = 31d736e21ce7f03192cf029a8b6419caa6f00a65
+SHA1 (patch-Source_kwsys_ProcessUNIX.c) = e333da03c3ac31be6a992809062a60a9cccc62c0
 SHA1 (patch-Tests_CMakeLists.txt) = 555e0be38ef92530c7315a87db65dd3004d7744c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX.c
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX.c:1.1
--- /dev/null   Sat Sep 30 08:52:52 2023
+++ pkgsrc/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX.c Sat Sep 30 08:52:52 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-Source_kwsys_ProcessUNIX.c,v 1.1 2023/09/30 08:52:52 nros Exp $
+
+* Use the correct ps command on NetBSD,
+  this also makes cmake runnable on NetBSD Sparc, see pkg/57272
+
+--- Source/kwsys/ProcessUNIX.c.orig    2023-09-27 13:10:16.942207869 +0000
++++ Source/kwsys/ProcessUNIX.c
+@@ -2500,7 +2500,7 @@ static pid_t kwsysProcessFork(kwsysProce
+    corresponding parsing format string.  The parsing format should
+    have two integers to store: the pid and then the ppid.  */
+ #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||       \
+-  defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
++  defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) || defined(__NetBSD__)
+ #  define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
+ #  define KWSYSPE_PS_FORMAT "%d %d\n"
+ #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */