[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/, net-libs/nodejs/

["Marek Szuba" <marecki@gentoo.org>]

commit:     d2aae48cbb242fae42837df1fba82b3aaf70139a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue May  4 15:37:14 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue May  4 15:41:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2aae48c

net-libs/nodejs: really link against system libuv

Turns out the bundled library "uvwasi" implicitly pulled in the bundled
libuv as a static library regardless of us having been passing
--shared-libuv to configure.py pretty much for ever. Fortunately,
patching the relevant lines out of the uvwasi gyp file seems to take
care of the problem.

Closes: https://bugs.gentoo.org/787251
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch    | 12 ++++++++++++
 net-libs/nodejs/nodejs-12.22.1-r1.ebuild                     |  1 +
 net-libs/nodejs/nodejs-14.16.1-r1.ebuild                     |  1 +
 net-libs/nodejs/nodejs-16.0.0-r1.ebuild                      |  1 +
 4 files changed, 15 insertions(+)

diff --git a/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
new file mode 100644
index 00000000000..eb56bb87d86
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch
@@ -0,0 +1,12 @@
+--- 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']
+       },

diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
index 52bbbaf5862..f96dac1dcb1 100644
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild
@@ -47,6 +47,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch
 	"${FILESDIR}"/${PN}-99999999-llhttp.patch
 )

diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
index 37454244851..c386c0e45b7 100644
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
+++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
 	"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch
 )

diff --git a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild
index b9358387895..95528f2021f 100644
--- a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
 	"${FILESDIR}"/${PN}-16.0.0-v8_lto.patch
 )