-
Notifications
You must be signed in to change notification settings - Fork 15.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: bump node to v20.17.0 (main) (#43428)
* chore: bump node in DEPS to v20.17.0 * module: disallow CJS <-> ESM edges in a cycle from require(esm) nodejs/node#52264 * src: expose LookupAndCompile with parameters nodejs/node#53886 * src: fix -Wshadow warning nodejs/node#53885 * lib: convert WeakMaps in cjs loader with symbol properties nodejs/node#52095 * src: reduce unnecessary serialization of CLI options in C++ nodejs/node#52451 * build: ensure v8_pointer_compression_sandbox is enabled on 64bit nodejs/node#53884 * lib: improve error message when index not found on cjs nodejs/node#53859 * src,lib: expose getCategoryEnabledBuffer to use on node.http nodejs/node#53602 * deps: update c-ares to v1.32.2 nodejs/node#53865 * chore: fixup patch indices * deps: update V8 to 12.2 nodejs/node#51362 * stream: Expose DuplexPair API nodejs/node#34111 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
- Loading branch information
1 parent
7cea992
commit 38512ef
Showing
36 changed files
with
270 additions
and
363 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
patches/node/build_don_t_redefine_win32_lean_and_mean.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Shelley Vohr <shelley.vohr@gmail.com> | ||
Date: Fri, 23 Aug 2024 16:50:19 +0200 | ||
Subject: build: don't redefine WIN32_LEAN_AND_MEAN | ||
|
||
https://github.com/nodejs/node/pull/53722 added a new define for WIN32_LEAN_AND_MEAN | ||
without first checking to see if it was defined - other areas in c-ares do this so | ||
we should here as well. Compilation errors occur otherwise: | ||
|
||
../../third_party/electron_node/deps/cares/include\ares_build.h(168,11): error: 'WIN32_LEAN_AND_MEAN' macro redefined [-Werror,-Wmacro-redefined] | ||
168 | # define WIN32_LEAN_AND_MEAN | ||
| ^ | ||
<command line>(25,9): note: previous definition is here | ||
25 | #define WIN32_LEAN_AND_MEAN 1 | ||
| ^ | ||
1 error generated. | ||
[287 processes, 49437/51449 @ 48.5/s : 1018.562s] CC obj/third_party/electron_node/deps/cares/cares/ares__socket.obj | ||
FAILED: obj/third_party/electron_node/deps/cares/cares/ares__socket.obj | ||
|
||
This should be upstreamed. | ||
|
||
diff --git a/deps/cares/include/ares_build.h b/deps/cares/include/ares_build.h | ||
index 18a92606a817145302c73b5081b4c989799bc620..bafd26d9210d2347fec41f028e9e65088b83c48c 100644 | ||
--- a/deps/cares/include/ares_build.h | ||
+++ b/deps/cares/include/ares_build.h | ||
@@ -165,7 +165,9 @@ | ||
# define CARES_TYPEOF_ARES_SOCKLEN_T int | ||
|
||
#elif defined(_WIN32) | ||
-# define WIN32_LEAN_AND_MEAN | ||
+# ifndef WIN32_LEAN_AND_MEAN | ||
+# define WIN32_LEAN_AND_MEAN | ||
+# endif | ||
# define CARES_TYPEOF_ARES_SOCKLEN_T int | ||
# define CARES_HAVE_WINDOWS_H 1 | ||
# define CARES_HAVE_SYS_TYPES_H 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.