Backport upstream commit [1] on top of node-v12.16.1 to allow the configure flag
"--shared-libuv" to work again (libuv was statically linked into libnode
before).
[1] f65d748f5805 ("build: uvwasi honours node_shared_libuv")
Signed-off-by: Ulrich Ölmann <[email protected]>
---
...ild-uvwasi-honours-node_shared_libuv.patch | 42 +++++++++++++++++++
patches/node-v12.16.1/series | 3 +-
2 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644
patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
diff --git
a/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
new file mode 100644
index 000000000000..a0f92ba15dbc
--- /dev/null
+++ b/patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <[email protected]>
+Date: Mon, 5 Jul 2021 00:22:46 +0200
+Subject: [PATCH] build: uvwasi honours node_shared_libuv
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix #39248.
+
+PR-URL: https://github.com/nodejs/node/pull/39260
+Reviewed-By: Richard Lau <[email protected]>
+Reviewed-By: Tobias Nießen <[email protected]>
+Reviewed-By: Colin Ihrig <[email protected]>
+Reviewed-By: James M Snell <[email protected]>
+---
+ deps/uvwasi/uvwasi.gyp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/deps/uvwasi/uvwasi.gyp b/deps/uvwasi/uvwasi.gyp
+index c07b07b608b7..3ff3daf3a11e 100644
+--- a/deps/uvwasi/uvwasi.gyp
++++ b/deps/uvwasi/uvwasi.gyp
+@@ -14,12 +14,16 @@
+ 'src/uv_mapping.c',
+ 'src/uvwasi.c',
+ ],
+- 'dependencies': [
+- '../uv/uv.gyp:libuv',
+- ],
+ 'direct_dependent_settings': {
+ 'include_dirs': ['include']
+ },
++ 'conditions': [
++ [ 'node_shared_libuv=="false"', {
++ 'dependencies': [
++ '../uv/uv.gyp:libuv',
++ ],
++ }],
++ ],
+ }
+ ]
+ }
diff --git a/patches/node-v12.16.1/series b/patches/node-v12.16.1/series
index f0162c556ddc..ff8057d57a58 100644
--- a/patches/node-v12.16.1/series
+++ b/patches/node-v12.16.1/series
@@ -5,4 +5,5 @@
0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch
0004-HACK-don-t-add-LD_LIBRARY_PATH-for-external-tools.patch
0005-HACK-run-configure-directly-with-python2.patch
-# c39d7fdc79e6b2f672a807f38ade396e - git-ptx-patches magic
+0006-build-uvwasi-honours-node_shared_libuv.patch
+# c8720e3d38a736f9877911821bd3e666 - git-ptx-patches magic
--
2.30.2
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
