[upstream_utils] Upgrade to libuv 1.48.0 (#6806)

wpilibsuite · Jul 7, 2024 · 0954ded · 0954ded
1 parent 1f92c59
commit 0954ded
Show file tree

Hide file tree

Showing 30 changed files with 732 additions and 298 deletions.
diff --git a/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch b/upstream_utils/libuv_patches/0001-Revert-win-process-write-minidumps-when-sending-SIGQ.patch
@@ -6,44 +6,43 @@ Subject: [PATCH 01/10] Revert "win,process: write minidumps when sending
 
 This reverts commit 748d894e82abcdfff7429cf745003e182c47f163.
 ---
- CMakeLists.txt    |   6 +--
+ CMakeLists.txt    |   5 +-
  configure.ac      |   2 +-
  include/uv/win.h  |   1 -
- src/win/process.c | 116 ----------------------------------------------
- 4 files changed, 2 insertions(+), 123 deletions(-)
+ src/win/process.c | 125 ----------------------------------------------
+ 4 files changed, 2 insertions(+), 131 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72377851b69f74c5285fd34ae206ad6bed3745c1..3ec6bd00542f5aacfc6245b1f82e365eb1cff02c 100644
+index 5e8e0166d743bc23f446b180fdbe6843492c754b..4b6ff2477e494dde7a876d8b5bd3e8985c93f0e8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -183,11 +183,7 @@ if(WIN32)
+@@ -188,10 +188,7 @@ if(WIN32)
         advapi32
         iphlpapi
         userenv
 -       ws2_32
 -       dbghelp
 -       ole32
--       uuid
 -       shell32)
 +       ws2_32)
    list(APPEND uv_sources
         src/win/async.c
         src/win/core.c
 diff --git a/configure.ac b/configure.ac
-index 0a1042ce3d384f6a4392a100275c14cb31ba2816..6c87c36039446e04f6c30c23b8fdb9b957dd610d 100644
+index d4cc003e34388de77fe1cfe2ebf12ab25b00b9b8..b215638506223e1c9edb1847bbcfccb7404be33f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -74,7 +74,7 @@ AM_CONDITIONAL([OS400],    [AS_CASE([$host_os],[os400],         [true], [false])
  AM_CONDITIONAL([SUNOS],    [AS_CASE([$host_os],[solaris*],      [true], [false])])
  AM_CONDITIONAL([WINNT],    [AS_CASE([$host_os],[mingw*],        [true], [false])])
  AS_CASE([$host_os],[mingw*], [
--    LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -luser32 -ldbghelp -lole32 -luuid -lshell32"
-+    LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv -luser32"
+-    LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -luserenv -luser32 -ldbghelp -lole32 -lshell32"
++    LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -luserenv -luser32 -lshell32"
  ])
  AS_CASE([$host_os], [solaris2.10], [
      CFLAGS="$CFLAGS -DSUNOS_NO_IFADDRS"
 diff --git a/include/uv/win.h b/include/uv/win.h
-index 6f8c47298e407bcb0151cf383a8370b71074f03e..eb74776978340a4910194bae35a9da6493e8c0a6 100644
+index f4adaa216c6f0c17437ed42ca594acbf1b8c2c56..518b17606c3b0c114845594e6be9c3c4d95f1776 100644
 --- a/include/uv/win.h
 +++ b/include/uv/win.h
 @@ -91,7 +91,6 @@ typedef struct pollfd {
@@ -55,7 +54,7 @@ index 6f8c47298e407bcb0151cf383a8370b71074f03e..eb74776978340a4910194bae35a9da64
  #define SIGWINCH             28
 
 diff --git a/src/win/process.c b/src/win/process.c
-index 43059858f3112e7e7185796525697629b72988df..119b46cb3f37122395c172c6e9700d472a2173ed 100644
+index 4e94dee90e13eede63d8e97ddc9992726f874ea9..4f0af83e83442bb905762361775abe05ab6beb4e 100644
 --- a/src/win/process.c
 +++ b/src/win/process.c
 @@ -32,9 +32,6 @@
@@ -68,7 +67,7 @@ index 43059858f3112e7e7185796525697629b72988df..119b46cb3f37122395c172c6e9700d47
 
 
  #define SIGKILL         9
-@@ -1173,120 +1170,7 @@ static int uv__kill(HANDLE process_handle, int signum) {
+@@ -1179,129 +1176,7 @@ static int uv__kill(HANDLE process_handle, int signum) {
      return UV_EINVAL;
    }
 
@@ -109,9 +108,18 @@ index 43059858f3112e7e7185796525697629b72988df..119b46cb3f37122395c172c6e9700d47
 -                         (PVOID) dump_folder,
 -                         &dump_folder_len);
 -      if (ret != ERROR_SUCCESS) {
+-        /* Workaround for missing uuid.dll on MinGW. */
+-        static const GUID FOLDERID_LocalAppData_libuv = {
+-          0xf1b32785, 0x6fba, 0x4fcf,
+-              {0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91}
+-        };
+-
 -        /* Default value for `dump_folder` is `%LOCALAPPDATA%\CrashDumps`. */
 -        WCHAR* localappdata;
--        SHGetKnownFolderPath(&FOLDERID_LocalAppData, 0, NULL, &localappdata);
+-        SHGetKnownFolderPath(&FOLDERID_LocalAppData_libuv,
+-                             0,
+-                             NULL,
+-                             &localappdata);
 -        _snwprintf_s(dump_folder,
 -                     sizeof(dump_folder),
 -                     _TRUNCATE,