nodejs: update to 16.9.1

List of changes:

- Add iana-etc to checkdepends
The nodejs tests require `/etc/services` to be present, but it is not
present without iana-etc.

- Ignore tests that timeout in template
There is a new variable with the name "COV_SKIP_TESTS", which contains
a comma seperated list of ignored tests. The current list has tests that
are by default part of ignored tests, and the two tests that timeout.
The two tests probably timeout because of the slow execution environment.

- Statically link llhttp and http_parser
Removed "shared http_parser" option, because of conflicts with nodejs-lts.
This commit is contained in:
Daniel Florescu 2021-09-20 18:09:17 +02:00 committed by John Zimmermann
parent 20b7e2cfdc
commit 0fa8cf3c35
2 changed files with 11 additions and 32 deletions

View file

@ -1,22 +1,9 @@
--- 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']
},
@@ -31,6 +28,12 @@
'_POSIX_C_SOURCE=200112',
@@ -33,6 +33,9 @@
'../uv/uv.gyp:libuv',
],
}],
+ [ 'node_shared_libuv=="false"', {
+ 'dependencies': [ '../uv/uv.gyp:libuv' ],
+ }],
+ [ 'node_shared_libuv=="true"', {
+ 'libraries': [ '-luv' ],
+ }]

View file

@ -1,34 +1,31 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.17.6
version=16.9.1
revision=1
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
$(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
$(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
checkdepends="procps-ng"
$(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)"
checkdepends="procps-ng iana-etc"
short_desc="Evented I/O for V8 javascript"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
checksum=@c5d6fc4c970ab1db16d279e4e53cf71f4abf4a1be9598dd0ecd6a2e0d433506a
checksum=2cfab037d84550556999af6328e9b657842d9b183e6be2a4995c87d2c49e9d03
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
build_options="ssl libuv icu nghttp2 cares"
desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser and llhttp"
desc_option_icu="Enable shared icu"
desc_option_nghttp2="Enable shared nghttp2"
desc_option_cares="Enable shared c-ares"
build_options_default="ssl libuv http_parser icu nghttp2 cares"
build_options_default="ssl libuv icu nghttp2 cares"
replaces="iojs>=0"
conflicts="nodejs-lts nodejs-lts-10"
@ -82,18 +79,12 @@ do_configure() {
fi
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
$(vopt_if ssl --shared-openssl) \
$(vopt_if libuv --shared-libuv) \
$(vopt_if nghttp2 --shared-nghttp2) \
$(vopt_if cares --shared-cares) ${_args}
}
post_configure() {
# Fix linking against llhttp
sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
}
do_build() {
if [ "$CROSS_BUILD" ]; then
make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
@ -103,7 +94,8 @@ do_build() {
}
do_check() {
make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
local CI_SKIP_TESTS="test-cluster-primary-error.js,test-cluster-primary-kill.js"
make CI_SKIP_TESTS="$CI_SKIP_TESTS" LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
}
do_install() {