| 1 |
commit: d2aae48cbb242fae42837df1fba82b3aaf70139a |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 15:37:14 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 15:41:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2aae48c |
| 7 |
|
| 8 |
net-libs/nodejs: really link against system libuv |
| 9 |
|
| 10 |
Turns out the bundled library "uvwasi" implicitly pulled in the bundled |
| 11 |
libuv as a static library regardless of us having been passing |
| 12 |
--shared-libuv to configure.py pretty much for ever. Fortunately, |
| 13 |
patching the relevant lines out of the uvwasi gyp file seems to take |
| 14 |
care of the problem. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/787251 |
| 17 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 18 |
|
| 19 |
.../nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch | 12 ++++++++++++ |
| 20 |
net-libs/nodejs/nodejs-12.22.1-r1.ebuild | 1 + |
| 21 |
net-libs/nodejs/nodejs-14.16.1-r1.ebuild | 1 + |
| 22 |
net-libs/nodejs/nodejs-16.0.0-r1.ebuild | 1 + |
| 23 |
4 files changed, 15 insertions(+) |
| 24 |
|
| 25 |
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 |
| 26 |
new file mode 100644 |
| 27 |
index 00000000000..eb56bb87d86 |
| 28 |
--- /dev/null |
| 29 |
+++ b/net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch |
| 30 |
@@ -0,0 +1,12 @@ |
| 31 |
+--- a/deps/uvwasi/uvwasi.gyp |
| 32 |
++++ b/deps/uvwasi/uvwasi.gyp |
| 33 |
+@@ -18,9 +18,6 @@ |
| 34 |
+ 'src/wasi_rights.c', |
| 35 |
+ 'src/wasi_serdes.c', |
| 36 |
+ ], |
| 37 |
+- 'dependencies': [ |
| 38 |
+- '../uv/uv.gyp:libuv', |
| 39 |
+- ], |
| 40 |
+ 'direct_dependent_settings': { |
| 41 |
+ 'include_dirs': ['include'] |
| 42 |
+ }, |
| 43 |
|
| 44 |
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 45 |
index 52bbbaf5862..f96dac1dcb1 100644 |
| 46 |
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 47 |
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 48 |
@@ -47,6 +47,7 @@ DEPEND=" |
| 49 |
PATCHES=( |
| 50 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 51 |
"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch |
| 52 |
+ "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 53 |
"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch |
| 54 |
"${FILESDIR}"/${PN}-99999999-llhttp.patch |
| 55 |
) |
| 56 |
|
| 57 |
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 58 |
index 37454244851..c386c0e45b7 100644 |
| 59 |
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 60 |
+++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 61 |
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}" |
| 62 |
|
| 63 |
PATCHES=( |
| 64 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 65 |
+ "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 66 |
"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch |
| 67 |
"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch |
| 68 |
) |
| 69 |
|
| 70 |
diff --git a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild |
| 71 |
index b9358387895..95528f2021f 100644 |
| 72 |
--- a/net-libs/nodejs/nodejs-16.0.0-r1.ebuild |
| 73 |
+++ b/net-libs/nodejs/nodejs-16.0.0-r1.ebuild |
| 74 |
@@ -41,6 +41,7 @@ BDEPEND="${PYTHON_DEPS} |
| 75 |
DEPEND="${RDEPEND}" |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
+ "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 79 |
"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch |
| 80 |
"${FILESDIR}"/${PN}-16.0.0-v8_lto.patch |
| 81 |
) |
Archives