diff options
| author | Ulrich Ölmann <u.oelmann@pengutronix.de> | 2022-01-14 14:57:42 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-01-21 10:14:37 +0100 |
| commit | eb898f648fd9c9e1f0ea6051b8543151500ddf41 (patch) | |
| tree | c94c9618d12a92b0d52a9d61b75a005feaaca121 | |
| parent | ec876750da47b6939e77d66fd36b267773716222 (diff) | |
| download | ptxdist-eb898f648fd9c9e1f0ea6051b8543151500ddf41.tar.gz ptxdist-eb898f648fd9c9e1f0ea6051b8543151500ddf41.tar.xz | |
nodejs: link libnode to an external libuv
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 <u.oelmann@pengutronix.de>
Message-Id: <20220114135742.1243330-1-u.oelmann@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/node-v12.16.1/0006-build-uvwasi-honours-node_shared_libuv.patch | 42 | ||||
| -rw-r--r-- | patches/node-v12.16.1/series | 3 |
2 files changed, 44 insertions, 1 deletions
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 000000000..a0f92ba15 --- /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?= <kapouer@melix.org> +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 <rlau@redhat.com> +Reviewed-By: Tobias Nießen <tniessen@tnie.de> +Reviewed-By: Colin Ihrig <cjihrig@gmail.com> +Reviewed-By: James M Snell <jasnell@gmail.com> +--- + 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 f0162c556..ff8057d57 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 |