From d89e4f81b3dad599dbd770e765012865fc71aad9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 9 Dec 2021 22:20:38 +0100 Subject: [PATCH] nodejs12: apply patch to avoid bundle libuv --- net-libs/nodejs/nodejs12-12.22.7.recipe | 2 +- .../nodejs/patches/nodejs-12.22.7.patchset | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/net-libs/nodejs/nodejs12-12.22.7.recipe b/net-libs/nodejs/nodejs12-12.22.7.recipe index 2d3095652..71ee78910 100644 --- a/net-libs/nodejs/nodejs12-12.22.7.recipe +++ b/net-libs/nodejs/nodejs12-12.22.7.recipe @@ -7,7 +7,7 @@ to be done, Node will sleep." HOMEPAGE="https://nodejs.org/" COPYRIGHT="2006-2019 The Node.js Foundation" LICENSE="BSD (2-clause)" -REVISION="1" +REVISION="2" SOURCE_URI="https://nodejs.org/dist/v$portVersion/node-v$portVersion.tar.xz" SOURCE_DIR="node-v$portVersion" CHECKSUM_SHA256="cc6a23b44870679a94bd8f3c8d4e1f4b77bb2712a36888ab87463459e6785f6b" diff --git a/net-libs/nodejs/patches/nodejs-12.22.7.patchset b/net-libs/nodejs/patches/nodejs-12.22.7.patchset index b3bf61d6e..85b460aeb 100644 --- a/net-libs/nodejs/patches/nodejs-12.22.7.patchset +++ b/net-libs/nodejs/patches/nodejs-12.22.7.patchset @@ -635,3 +635,39 @@ index d54e7c6..0643dd3 100644 -- 2.30.2 +From c1b5978747709c2ce6516c1771354545d6c53060 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= +Date: Mon, 5 Jul 2021 00:22:46 +0200 +Subject: [PATCH] build: uvwasi honours node_shared_libuv + +Fix #39248. +--- + deps/uvwasi/uvwasi.gyp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/deps/uvwasi/uvwasi.gyp b/deps/uvwasi/uvwasi.gyp +index d4189eeee2fc..5822f8d59bd9 100644 +--- a/deps/uvwasi/uvwasi.gyp ++++ b/deps/uvwasi/uvwasi.gyp +@@ -18,9 +18,6 @@ + 'src/wasi_rights.c', + 'src/wasi_serdes.c', + ], +- 'dependencies': [ +- '../uv/uv.gyp:libuv', +- ], + 'direct_dependent_settings': { + 'include_dirs': ['include'] + }, +@@ -31,6 +28,11 @@ + '_POSIX_C_SOURCE=200112', + ], + }], ++ [ 'node_shared_libuv=="false"', { ++ 'dependencies': [ ++ '../uv/uv.gyp:libuv', ++ ], ++ }], + ], + } + ]