Skip to content

Commit fc1b436

Browse files
authored
build: use variable for simdutf path
nodejs/node#56196
1 parent 9757cd8 commit fc1b436

File tree

1 file changed

+6
-37
lines changed

1 file changed

+6
-37
lines changed

patches/node/build_use_third_party_simdutf.patch

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,15 @@ Subject: build: use third_party/simdutf
66
use the Chromium version of simdutf to avoid duplicate symbols
77

88
diff --git a/node.gni b/node.gni
9-
index 461bff93e151c454cd0a9575daa01d3f7c0ec9c3..a1eab549b8686c24399f5206f9b611bcbce3d470 100644
9+
index 56a554175b805c1703f13d62041f8c80d6e94dd9..203b4abbc44df9e58083c819f61f9025104abdc6 100644
1010
--- a/node.gni
1111
+++ b/node.gni
12-
@@ -12,6 +12,8 @@ declare_args() {
13-
14-
node_crypto_path = "//third_party/boringssl"
12+
@@ -14,7 +14,7 @@ declare_args() {
13+
node_openssl_path = "//third_party/boringssl"
1514

15+
# The location of simdutf - use the one from node's deps by default.
16+
- node_simdutf_path = "$node_path/deps/simdutf"
1617
+ node_simdutf_path = "//third_party/simdutf"
17-
+
18+
1819
# The NODE_MODULE_VERSION defined in node_version.h.
1920
node_module_version = exec_script("$node_path/tools/getmoduleversion.py", [], "value")
20-
21-
diff --git a/unofficial.gni b/unofficial.gni
22-
index 87bfc313dd1408e597e929ba93c8c0f52ae39ced..4ef97ab65bdfacca4d6dbbc603da0218214b039d 100644
23-
--- a/unofficial.gni
24-
+++ b/unofficial.gni
25-
@@ -155,7 +155,7 @@ template("node_gn_build") {
26-
"deps/nbytes",
27-
"deps/nghttp2",
28-
"deps/postject",
29-
- "deps/simdutf",
30-
+ "$node_simdutf_path",
31-
"deps/sqlite",
32-
"deps/uvwasi",
33-
"//third_party/zlib",
34-
@@ -310,7 +310,7 @@ template("node_gn_build") {
35-
executable("node_js2c") {
36-
defines = []
37-
deps = [
38-
- "deps/simdutf",
39-
+ "$node_simdutf_path",
40-
"deps/uv",
41-
]
42-
sources = [
43-
@@ -417,7 +417,7 @@ template("node_gn_build") {
44-
"deps/googletest",
45-
"deps/googletest:gtest_main",
46-
"deps/nbytes",
47-
- "deps/simdutf",
48-
+ "$node_simdutf_path",
49-
]
50-
51-
sources = gypi_values.node_cctest_sources

0 commit comments

Comments
 (0)