* Re: [WIP] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
@ 2019-12-25 23:21 ` voidlinux-github
2019-12-25 23:27 ` voidlinux-github
` (17 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-12-25 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-568937515
Comment:
pretty much anything involving formatting and arch conditionals in this needs to be discarded
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [WIP] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
2019-12-25 23:21 ` [WIP] nodejs*: update voidlinux-github
@ 2019-12-25 23:27 ` voidlinux-github
2019-12-26 13:29 ` [PR PATCH] [Updated] " voidlinux-github
` (16 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-12-25 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-568937785
Comment:
the `llhttp_set_lenient` error should be fixed by updating `llhttp` first
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
2019-12-25 23:21 ` [WIP] nodejs*: update voidlinux-github
2019-12-25 23:27 ` voidlinux-github
@ 2019-12-26 13:29 ` voidlinux-github
2019-12-26 13:31 ` voidlinux-github
` (15 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-12-26 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
[WIP] nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 15013 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From 7728157df06bbb570e7791b477a3e0b1c8810763 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:37:39 +0300
Subject: [PATCH 2/4] nodejs: update to 13.5.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..73b62db458d 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.5.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=4b8078d896a7550d7ed399c1b4ac9043e9f883be404d9b337185c8d8479f2db8
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 651d8f6c3d3e70cdb6fd33cf34e0f165c57ed68d Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 16:19:23 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.0. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..55b63e1e2c7 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=5c1939867228f3845c808ef84a89c8ee93cc35f857bf7587ecee1b5a6d9da67b
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgname}-${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From 130fc7c3c7d7585d6367647d25d3072908004484 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 16:28:43 +0300
Subject: [PATCH 4/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..58ca667eae3 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [WIP] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (2 preceding siblings ...)
2019-12-26 13:29 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-26 13:31 ` voidlinux-github
2020-01-08 18:27 ` [PR PATCH] [Updated] " voidlinux-github
` (14 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-12-26 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-569059097
Comment:
@q66 Thanks for the help! Updating `llhttp` to the latest version fixed the problem.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (3 preceding siblings ...)
2019-12-26 13:31 ` voidlinux-github
@ 2020-01-08 18:27 ` voidlinux-github
2020-01-08 18:28 ` voidlinux-github
` (13 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 15221 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/5] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From eb84878ed11d251bf333d0bad8614597b56989fa Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 16:28:43 +0300
Subject: [PATCH 2/5] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..58ca667eae3 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 6845ac7c6a3e3c8cfeb163740fd211414e8c6bad Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:25:20 +0300
Subject: [PATCH 3/5] nodejs: update to 13.6.0.
---
srcpkgs/nodejs/template | 50 ++++++++++++++++++-----------------------
1 file changed, 22 insertions(+), 28 deletions(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..3adf356e93a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 8b42d5c3cb009549223005b81e099502f6a0278e Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:26:29 +0300
Subject: [PATCH 4/5] nodejs: update to 13.6.0.
---
srcpkgs/nodejs/patches/ppc32.patch | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
From 4e9463bf98fbc838aeb6920b5d9614a17d238ade Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:26:52 +0300
Subject: [PATCH 5/5] nodejs-lts: update to 12.14.1.
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..8014f2e27cd 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgname}-${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-01-08 18:27 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-08 18:28 ` voidlinux-github
2020-01-08 18:29 ` voidlinux-github
` (12 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 15001 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From eb84878ed11d251bf333d0bad8614597b56989fa Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 16:28:43 +0300
Subject: [PATCH 2/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..58ca667eae3 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 6f67d1d541812a113fa177153c7715f5c139f3c5 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:26:52 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1.
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..8014f2e27cd 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgname}-${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From b890b5c5615716330e6ee02297b1c97e327b5852 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:28:24 +0300
Subject: [PATCH 4/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..3adf356e93a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-01-08 18:28 ` voidlinux-github
@ 2020-01-08 18:29 ` voidlinux-github
2020-01-08 19:24 ` voidlinux-github
` (11 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 18:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 15011 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From eb84878ed11d251bf333d0bad8614597b56989fa Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 16:28:43 +0300
Subject: [PATCH 2/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..58ca667eae3 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 21e153919250ef21b6619401961cfc96f669d638 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:26:52 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..8014f2e27cd 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgname}-${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From c96328ee80a05d2dbfe53c452c18a9b351860d6c Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:28:24 +0300
Subject: [PATCH 4/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..3adf356e93a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ '*') msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-01-08 18:29 ` voidlinux-github
@ 2020-01-08 19:24 ` voidlinux-github
2020-01-08 19:27 ` voidlinux-github
` (10 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 14987 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From 13fdabaa1aa51fc9b97a0da236d84890543536a0 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:28:24 +0300
Subject: [PATCH 2/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..37f586992c3 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 301d42a886690c8a64a54d60f5d98a0585e498f5 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:23:28 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..9c41a984dbf 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From 90db7cb97639258b3811975212fede825b4f88f8 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:24:18 +0300
Subject: [PATCH 4/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..783cc63785b 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-01-08 19:24 ` voidlinux-github
@ 2020-01-08 19:27 ` voidlinux-github
2020-01-08 19:30 ` voidlinux-github
` (9 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 19:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 14991 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From 13fdabaa1aa51fc9b97a0da236d84890543536a0 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:28:24 +0300
Subject: [PATCH 2/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..37f586992c3 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From c305e2c0be995a28491de7947f214290aab41278 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:24:18 +0300
Subject: [PATCH 3/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..f3f36d9171b 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args=" --dest-cpu=arm";;
+ 'aarch64*') _args=" --dest-cpu=arm64";;
+ 'ppc64*') _args=" --dest-cpu=ppc64";;
+ 'ppc*') _args=" --dest-cpu=ppc";;
+ 'mipsel*') _args=" --dest-cpu=mipsel";;
+ 'mips*') _args=" --dest-cpu=mips";;
+ 'i686*') _args=" --dest-cpu=x86";;
+ 'x86_64*') _args=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 5076bed9947baf242bf810028623612890d95e0c Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:27:26 +0300
Subject: [PATCH 4/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..cc1476e2071 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-01-08 19:27 ` voidlinux-github
@ 2020-01-08 19:30 ` voidlinux-github
2020-01-08 20:52 ` voidlinux-github
` (8 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 14999 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From 13fdabaa1aa51fc9b97a0da236d84890543536a0 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 21:28:24 +0300
Subject: [PATCH 2/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 ------------
srcpkgs/nodejs/template | 50 +++++++++++++-----------------
2 files changed, 22 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..37f586992c3 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,41 +32,34 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "${pkgver}: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
@@ -77,10 +69,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 2a0836e97d2861e89d1f275e4bd05d75e6e43a1a Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:27:26 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 -----------
srcpkgs/nodejs-lts/template | 46 +++++++++++---------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 20 insertions(+), 48 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..cc1476e2071 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,9 +1,8 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +32,43 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
-case "$XBPS_TARGET_MACHINE" in
- ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+case "$XBPS_MACHINE" in
+ 'mips*'|'ppc64*') hostmakedepends+=" libatomic-devel";;
esac
-# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
- mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
-esac
-
-# also need it on host when it's one of those archs
-case "$XBPS_MACHINE" in
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc64*') makedepends+=" libatomic-devel";;
+ 'ppc*') broken="Node ${version} does not support 32-bit ppc.";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From cf2f7c29fcec8aa442114438524cd1045cb3e31f Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Wed, 8 Jan 2020 22:30:32 +0300
Subject: [PATCH 4/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 38 ++++++++++++++++++----------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..9a79240737d 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,39 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
- ppc64*) ;;
- mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
+ 'mips*'|'ppc'|'ppc-musl') hostmakedepends+=" libatomic-devel";;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
+ 'arm*') _args+=" --dest-cpu=arm";;
+ 'aarch64*') _args+=" --dest-cpu=arm64";;
+ 'ppc64*') _args+=" --dest-cpu=ppc64";;
+ 'ppc*') _args+=" --dest-cpu=ppc";;
+ 'mipsel*') _args+=" --dest-cpu=mipsel";;
+ 'mips*') _args+=" --dest-cpu=mips";;
+ 'i686*') _args+=" --dest-cpu=x86";;
+ 'x86_64*') _args+=" --dest-cpu=x86_64";;
+ *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n";;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
- ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
+ 'ppc64'|'ppc64-musl') _args+=" --openssl-no-asm";;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-01-08 19:30 ` voidlinux-github
@ 2020-01-08 20:52 ` voidlinux-github
2020-01-09 14:27 ` voidlinux-github
` (7 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-08 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572251877
Comment:
It’s better read, isn't it?
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (10 preceding siblings ...)
2020-01-08 20:52 ` voidlinux-github
@ 2020-01-09 14:27 ` voidlinux-github
2020-01-09 16:12 ` [PR PATCH] [Updated] " voidlinux-github
` (6 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 14:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572584943
Comment:
no, it's not, and even if it was, it wouldn't belong in the PR
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (11 preceding siblings ...)
2020-01-09 14:27 ` voidlinux-github
@ 2020-01-09 16:12 ` voidlinux-github
2020-01-09 17:43 ` voidlinux-github
` (5 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 16:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 14099 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From b71c4b4bee5efba462f9e8bb08cf633af278050a Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 19:05:28 +0300
Subject: [PATCH 2/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 -----------------
srcpkgs/nodejs/template | 35 +++++++++++++++---------------
2 files changed, 18 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..41912427717 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,42 +32,42 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+ ppc*) broken="Node ${version} does not support 32-bit ppc.";;
esac
# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
esac
# also need it on host when it's one of those archs
case "$XBPS_MACHINE" in
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
+
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
# by the build system, because it's technically the same architecture
@@ -77,10 +76,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From 23c597b814c25314bf417b181c86ba9d4335c5fa Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 19:09:13 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 ------------------
srcpkgs/nodejs-lts/template | 29 +++++++++++++-------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 15 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..2859664d220 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +33,49 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+ ppc*) broken="Node ${version} does not support 32-bit ppc." ;;
esac
# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
esac
# also need it on host when it's one of those archs
case "$XBPS_MACHINE" in
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From 423ea502c77226e07ce9df4a7834c41a364f3dd0 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 19:12:07 +0300
Subject: [PATCH 4/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..a627d9a2fa5 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,40 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
ppc64*) ;;
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ ppc*) _args+=" --dest-cpu=ppc" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (12 preceding siblings ...)
2020-01-09 16:12 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-09 17:43 ` voidlinux-github
2020-01-09 18:53 ` [PR PATCH] [Updated] " voidlinux-github
` (4 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 17:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572673136
Comment:
there are whitespace issues in the templates, fix them
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (13 preceding siblings ...)
2020-01-09 17:43 ` voidlinux-github
@ 2020-01-09 18:53 ` voidlinux-github
2020-01-09 19:03 ` voidlinux-github
` (3 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages nodejs
https://github.com/void-linux/void-packages/pull/17592
nodejs*: update
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
A patch file from https://github.com/void-linux/void-packages/pull/17592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nodejs-17592.patch --]
[-- Type: text/x-diff, Size: 14090 bytes --]
From 4fcec5d87ca586bc3d65dcbf5a14cdf83c258bd2 Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 26 Dec 2019 13:36:17 +0300
Subject: [PATCH 1/4] llhttp: update to 2.0.1. [ci skip]
---
srcpkgs/llhttp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template
index 3cf0b41e92d..4b155acc2dc 100644
--- a/srcpkgs/llhttp/template
+++ b/srcpkgs/llhttp/template
@@ -1,6 +1,6 @@
# Template file for 'llhttp'
pkgname=llhttp
-version=1.1.4
+version=2.0.1
revision=1
wrksrc="llhttp-release-v${version}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ homepage="https://llhttp.org/"
# _always_ use releases. Those have the C code generated, otherwise
# we'd have a dep loop nodejs<->llhttp
distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz"
-checksum=eeb07e60a8f4113b110dd758756da3db69e4e2575b0407afb0a7755aef504dbb
+checksum=76100c5b7948c8e49e8afa8c658e2a477bcb831e18854cf134aa3bfd44a5c669
post_extract() {
# No need to pull in gyp for such a simple Makefile...
From 2f401a1b6cfd8a146001226ea3a96caa79aed07a Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 21:52:51 +0300
Subject: [PATCH 2/4] nodejs: update to 13.6.0. [ci skip]
---
srcpkgs/nodejs/patches/ppc32.patch | 20 -----------------
srcpkgs/nodejs/template | 35 +++++++++++++++---------------
2 files changed, 18 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/nodejs/patches/ppc32.patch
diff --git a/srcpkgs/nodejs/patches/ppc32.patch b/srcpkgs/nodejs/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 07cd6497856..dfff61f8307 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,14 +1,13 @@
# Template file for 'nodejs'
pkgname=nodejs
-version=13.2.0
+version=13.6.0
revision=1
wrksrc="node-v${version}"
-# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
$(vopt_if ssl libressl-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)"
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
+checksum=c1db19b4cf23b3903ac3048dad44a05397a63854b2a159fedc454eb15650369a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,42 +32,42 @@ conflicts="nodejs-lts nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+ ppc*) broken="Node ${version} does not support 32-bit ppc.";;
esac
# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
esac
# also need it on host when it's one of those archs
case "$XBPS_MACHINE" in
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
+
# this is necessary - for example, normally compiling from ppc64le
# to ppc64 or from glibc to musl is considered non-cross-compiling
# by the build system, because it's technically the same architecture
@@ -77,10 +76,12 @@ do_configure() {
# to execute it within the build system fails
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
From c87474255903eb926e66862de19cea10225083de Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 21:53:08 +0300
Subject: [PATCH 3/4] nodejs-lts: update to 12.14.1. [ci skip]
---
srcpkgs/nodejs-lts/patches/ppc32.patch | 20 ------------------
srcpkgs/nodejs-lts/template | 29 +++++++++++++-------------
srcpkgs/nodejs-lts/update | 2 --
3 files changed, 15 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts/update
diff --git a/srcpkgs/nodejs-lts/patches/ppc32.patch b/srcpkgs/nodejs-lts/patches/ppc32.patch
deleted file mode 100644
index 502d471429f..00000000000
--- a/srcpkgs/nodejs-lts/patches/ppc32.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/v8/src/libsampler/sampler.cc.orig
-+++ deps/v8/src/libsampler/sampler.cc
-@@ -423,10 +423,17 @@
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.regs->link);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
- state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[36]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ state->lr = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[36]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index aa4a2d86c7b..28f4e28d51d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.13.1
+version=12.14.1
revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=4ee710087687c8de142329d95085f5cba66e454a2c9ea7ec11e1f4b476d6d1ac
+checksum=42a7f0777fea8825611cb9250ff927824dba4f7aea854b47d522798acf4bdbc6
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -33,48 +33,49 @@ conflicts="nodejs nodejs-lts-10"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
- ppc*) broken="Node 12.x does not support 32-bit ppc" ;;
+ ppc*) broken="Node ${version} does not support 32-bit ppc." ;;
esac
# v8 requires libatomic on ppc*/s390x/mips*
case "$XBPS_TARGET_MACHINE" in
mips*|ppc*) makedepends+=" libatomic-devel" ;;
- *) ;;
esac
# also need it on host when it's one of those archs
case "$XBPS_MACHINE" in
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
_args+=" --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
diff --git a/srcpkgs/nodejs-lts/update b/srcpkgs/nodejs-lts/update
deleted file mode 100644
index 85376d5582e..00000000000
--- a/srcpkgs/nodejs-lts/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://nodejs.org/dist
-pattern='v\K8\.9\.\d(?=\/)'
From 6a70acd261ed9bac868ce5214b4c5a46cfa9bf0c Mon Sep 17 00:00:00 2001
From: k4leg <d0xi@inbox.ru>
Date: Thu, 9 Jan 2020 21:53:20 +0300
Subject: [PATCH 4/4] nodejs-lts-10: update to 10.18.0. [ci skip]
---
srcpkgs/nodejs-lts-10/template | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 3f201bcb586..3597d45211a 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,6 +1,6 @@
# Template file for 'nodejs-lts-10'
pkgname=nodejs-lts-10
-version=10.17.0
+version=10.18.0
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
@@ -15,8 +15,8 @@ short_desc="Evented I/O for V8 javascript (Dubnium)"
maintainer="k4leg <d0xi@inbox.ru>"
license="MIT"
homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/latest-v10.x/node-v${version}.tar.xz"
-checksum=412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e
+distfiles="${homepage}/download/release/latest-dubnium/node-v${version}.tar.xz"
+checksum=0b2662ab849713dea708d3f74fe5e63fe2d0e869d1dc06b9e9f178ed1c66fede
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@@ -32,37 +32,40 @@ conflicts="nodejs nodejs-lts"
provides="nodejs-runtime-0_1"
if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
+ nocross="Host and target must have the same pointer size."
fi
case "$XBPS_MACHINE" in
ppc64*) ;;
mips*|ppc*) hostmakedepends+=" libatomic-devel" ;;
- *) ;;
esac
do_configure() {
local _args
+ _args="--dest-os=linux --use-largepages"
export LD="$CXX"
+
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
+ arm*) _args+=" --dest-cpu=arm" ;;
+ aarch64*) _args+=" --dest-cpu=arm64" ;;
+ ppc64*) _args+=" --dest-cpu=ppc64" ;;
+ ppc*) _args+=" --dest-cpu=ppc" ;;
+ mipsel*) _args+=" --dest-cpu=mipsel" ;;
+ mips*) _args+=" --dest-cpu=mips" ;;
+ i686*) _args+=" --dest-cpu=x86" ;;
+ x86_64*) _args+=" --dest-cpu=x86_64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
- _args+=" --without-snapshot"
+ _args+=" --without-snapshot --cross-compiling"
fi
+
# their pregenerated asm is for ELFv1...
case "$XBPS_TARGET_MACHINE" in
ppc64|ppc64-musl) _args+=" --openssl-no-asm" ;;
esac
+
./configure --prefix=/usr --shared-zlib \
$(vopt_if icu --with-intl=system-icu) \
$(vopt_if http_parser --shared-http-parser) \
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (14 preceding siblings ...)
2020-01-09 18:53 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-09 19:03 ` voidlinux-github
2020-01-09 19:04 ` voidlinux-github
` (2 subsequent siblings)
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572706369
Comment:
Seriously, do it OK or I will give up. This is not a game.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (15 preceding siblings ...)
2020-01-09 19:03 ` voidlinux-github
@ 2020-01-09 19:04 ` voidlinux-github
2020-01-09 19:41 ` voidlinux-github
2020-03-13 17:42 ` [PR PATCH] [Closed]: " k4leg
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572706872
Comment:
We told you 3 or more times, your quoting is wrong and stupid. So? Have a nice day.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (16 preceding siblings ...)
2020-01-09 19:04 ` voidlinux-github
@ 2020-01-09 19:41 ` voidlinux-github
2020-03-13 17:42 ` [PR PATCH] [Closed]: " k4leg
18 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2020-01-09 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17592#issuecomment-572721971
Comment:
hmm i don't see any more quotes
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Closed]: nodejs*: update
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-17592@inbox.vuxu.org>
` (17 preceding siblings ...)
2020-01-09 19:41 ` voidlinux-github
@ 2020-03-13 17:42 ` k4leg
18 siblings, 0 replies; 19+ messages in thread
From: k4leg @ 2020-03-13 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
There's a closed pull request on the void-packages repository
nodejs*: update
https://github.com/void-linux/void-packages/pull/17592
Description:
Do I need to rebuild packages that depend on `nodejs*` or `nodejs*-devel`?
(https://nodejs.org/en/blog/vulnerability/december-2019-security-releases/)
^ permalink raw reply [flat|nested] 19+ messages in thread