863faea542
* chore: bump node in DEPS to v22.11.0 * src: move evp stuff to ncrypto https://github.com/nodejs/node/pull/54911 * crypto: add Date fields for validTo and validFrom https://github.com/nodejs/node/pull/54159 * module: fix discrepancy between .ts and .js https://github.com/nodejs/node/pull/54461 * esm: do not interpret "main" as a URL https://github.com/nodejs/node/pull/55003 * src: modernize likely/unlikely hints https://github.com/nodejs/node/pull/55155 * chore: update patch indices * crypto: add validFromDate and validToDate fields to X509Certificate https://github.com/nodejs/node/pull/54159 * chore: fixup perfetto patch * fix: clang warning in simdjson * src: add receiver to fast api callback methods https://github.com/nodejs/node/pull/54408 * chore: fixup revert patch * fixup! esm: do not interpret "main" as a URL * fixup! crypto: add Date fields for validTo and validFrom * fix: move ArrayBuffer test patch * src: fixup Error.stackTraceLimit during snapshot building https://github.com/nodejs/node/pull/55121 * fix: bad rebase * chore: fixup amaro * chore: address feedback from review * src: revert filesystem::path changes https://github.com/nodejs/node/pull/55015 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Charles Kerr <charles@charleskerr.com>
|
|
Date: Mon, 9 Dec 2024 11:18:51 -0600
|
|
Subject: build: use third_party/simdutf
|
|
|
|
use the Chromium version of simdutf to avoid duplicate symbols
|
|
|
|
diff --git a/node.gni b/node.gni
|
|
index 461bff93e151c454cd0a9575daa01d3f7c0ec9c3..a1eab549b8686c24399f5206f9b611bcbce3d470 100644
|
|
--- a/node.gni
|
|
+++ b/node.gni
|
|
@@ -12,6 +12,8 @@ declare_args() {
|
|
|
|
node_crypto_path = "//third_party/boringssl"
|
|
|
|
+ node_simdutf_path = "//third_party/simdutf"
|
|
+
|
|
# The NODE_MODULE_VERSION defined in node_version.h.
|
|
node_module_version = exec_script("$node_path/tools/getmoduleversion.py", [], "value")
|
|
|
|
diff --git a/unofficial.gni b/unofficial.gni
|
|
index 87bfc313dd1408e597e929ba93c8c0f52ae39ced..4ef97ab65bdfacca4d6dbbc603da0218214b039d 100644
|
|
--- a/unofficial.gni
|
|
+++ b/unofficial.gni
|
|
@@ -155,7 +155,7 @@ template("node_gn_build") {
|
|
"deps/nbytes",
|
|
"deps/nghttp2",
|
|
"deps/postject",
|
|
- "deps/simdutf",
|
|
+ "$node_simdutf_path",
|
|
"deps/sqlite",
|
|
"deps/uvwasi",
|
|
"//third_party/zlib",
|
|
@@ -310,7 +310,7 @@ template("node_gn_build") {
|
|
executable("node_js2c") {
|
|
defines = []
|
|
deps = [
|
|
- "deps/simdutf",
|
|
+ "$node_simdutf_path",
|
|
"deps/uv",
|
|
]
|
|
sources = [
|
|
@@ -417,7 +417,7 @@ template("node_gn_build") {
|
|
"deps/googletest",
|
|
"deps/googletest:gtest_main",
|
|
"deps/nbytes",
|
|
- "deps/simdutf",
|
|
+ "$node_simdutf_path",
|
|
]
|
|
|
|
sources = gypi_values.node_cctest_sources
|