From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0B9F1382C5 for ; Tue, 4 May 2021 15:42:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25113E083D; Tue, 4 May 2021 15:42:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F74EE083D for ; Tue, 4 May 2021 15:42:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5FC9340A35 for ; Tue, 4 May 2021 15:42:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82F275C4 for ; Tue, 4 May 2021 15:42:06 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1620142917.d2aae48cbb242fae42837df1fba82b3aaf70139a.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/files/, net-libs/nodejs/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/files/nodejs-12.22.1-uvwasi_shared_libuv.patch net-libs/nodejs/nodejs-12.22.1-r1.ebuild net-libs/nodejs/nodejs-14.16.1-r1.ebuild net-libs/nodejs/nodejs-16.0.0-r1.ebuild X-VCS-Directories: net-libs/nodejs/files/ net-libs/nodejs/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: d2aae48cbb242fae42837df1fba82b3aaf70139a X-VCS-Branch: master Date: Tue, 4 May 2021 15:42:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 672feb08-294e-49ea-bb9c-99b6e20253a6 X-Archives-Hash: 9bab401edcf052efb20c15ef03752c1a commit: d2aae48cbb242fae42837df1fba82b3aaf70139a Author: Marek Szuba gentoo org> AuthorDate: Tue May 4 15:37:14 2021 +0000 Commit: Marek Szuba gentoo 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 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 )