Re: [PR PATCH] [Updated] Use system libuv in nodejs and nodejs-lts

[digitalagedragon <digitalagedragon@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]

There is an updated pull request by digitalagedragon against master on the void-packages repository

https://github.com/digitalagedragon/void-packages 29034-nodejs-system-libraries
https://github.com/void-linux/void-packages/pull/30516

Use system libuv in nodejs and nodejs-lts
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR

This addresses part of #29034. I've verified that it causes the `node` binary to depend on `libuv.so` and that it doesn't cause any (additional) test failures on my machine.

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30516.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-29034-nodejs-system-libraries-30516.patch --]
[-- Type: text/x-diff, Size: 5464 bytes --]

From 06410b655878fe8825f10da90b9cc34a5e05ccf9 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:25:46 -0700
Subject: [PATCH 1/3] nodejs: use system libuv

See https://github.com/void-linux/void-packages/issues/29034.

`shared-uv.patch` has been in the repo for a while but was slightly
broken.
---
 srcpkgs/nodejs/{ => patches}/shared-uv.patch | 2 +-
 srcpkgs/nodejs/template                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename srcpkgs/nodejs/{ => patches}/shared-uv.patch (97%)

diff --git a/srcpkgs/nodejs/shared-uv.patch b/srcpkgs/nodejs/patches/shared-uv.patch
similarity index 97%
rename from srcpkgs/nodejs/shared-uv.patch
rename to srcpkgs/nodejs/patches/shared-uv.patch
index 128e3a5ce06e..3e609a6c49a5 100644
--- a/srcpkgs/nodejs/shared-uv.patch
+++ b/srcpkgs/nodejs/patches/shared-uv.patch
@@ -16,7 +16,7 @@
          }],
 +        [ 'node_shared_libuv=="false"', {
 +          'dependencies': [ '../uv/uv.gyp:libuv' ],
-+        }]
++        }],
 +        [ 'node_shared_libuv=="true"', {
 +          'libraries': [ '-luv' ],
 +        }]
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 450b59bbc7d0..bcfaaa73ac4c 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=14.16.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="which pkg-config python3 libatomic-devel zlib-devel

From 222b25551a493a75b589f5c1dfc055fa8beb4c39 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Sun, 25 Apr 2021 09:59:58 -0700
Subject: [PATCH 2/3] 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 000000000000..3e609a6c49a5
--- /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 f9326d337555..d3912ae2cf05 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

From 529efb82fc4f9b1e9f9a41215d88b411fb436d89 Mon Sep 17 00:00:00 2001
From: Morgan Thomas <m@m0rg.dev>
Date: Mon, 26 Apr 2021 06:31:01 -0700
Subject: [PATCH 3/3] nodejs-lts-10: fix build for targets without native
 atomic8

patches/ppc32.patch used "host_arch" instead of "target_arch" to check
whether to link against -latomic, and didn't include 32-bit ARM in the
list of targets that might need it. This addresses build failures on
armv6l as well as some lesser-used architectures.
---
 srcpkgs/nodejs-lts-10/patches/ppc32.patch | 2 +-
 srcpkgs/nodejs-lts-10/template            | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
index 343eff585123..da8b6b7c7cf4 100644
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
@@ -15,7 +15,7 @@
        'msvs_disabled_warnings!': [4244],
  
        'conditions': [
-+        [ 'host_arch=="mips" or host_arch=="mipsel" or host_arch=="ppc"', {
++        [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
 +	  'link_settings': {
 +	    'libraries': [ '-latomic' ],
 +	  },
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3944d359c673..2279e49a586d 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts-10'
 pkgname=nodejs-lts-10
 version=10.24.0
-revision=1
+revision=2
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
  $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
@@ -37,9 +37,7 @@ if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
 	nocross="host and target must have the same pointer size"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-fi
+makedepends+=" libatomic-devel"
 if [ "$XBPS_NO_ATOMIC8" ]; then
 	hostmakedepends+=" libatomic-devel"
 fi