From 6cc2e7320eccc456527846e1a6bd55e812e4a4c3 Mon Sep 17 00:00:00 2001 From: Morgan Thomas Date: Sun, 25 Apr 2021 09:59:58 -0700 Subject: [PATCH] nodejs-lts: use system libuv See 06410b655878fe8825f10da90b9cc34a5e05ccf9 and https://github.com/void-linux/void-packages/issues/29034. --- srcpkgs/nodejs-lts/patches/shared-uv.patch | 25 ++++++++++++++++++++++ srcpkgs/nodejs-lts/template | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nodejs-lts/patches/shared-uv.patch diff --git a/srcpkgs/nodejs-lts/patches/shared-uv.patch b/srcpkgs/nodejs-lts/patches/shared-uv.patch new file mode 100644 index 00000000000..3e609a6c49a --- /dev/null +++ b/srcpkgs/nodejs-lts/patches/shared-uv.patch @@ -0,0 +1,25 @@ +--- deps/uvwasi/uvwasi.gyp.orig ++++ 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,12 @@ + '_POSIX_C_SOURCE=200112', + ], + }], ++ [ 'node_shared_libuv=="false"', { ++ 'dependencies': [ '../uv/uv.gyp:libuv' ], ++ }], ++ [ 'node_shared_libuv=="true"', { ++ 'libraries': [ '-luv' ], ++ }] + ], + } + ] diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index f9326d33755..d3912ae2cf0 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -1,7 +1,7 @@ # Template file for 'nodejs-lts' pkgname=nodejs-lts version=12.21.0 -revision=1 +revision=2 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="pkg-config python libatomic-devel zlib-devel which