jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nodejs: update to 12.7.0.

Browse source
This commit is contained in:
Leah Neukirchen 2019-08-02 15:24:43 +02:00 committed by Leah Neukirchen
parent 2c8ed6bf7f
commit 087f0f8184
2 changed files with 6 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
srcpkgs/nodejs/patches/ppc64.patch
View file

@ -1,41 +0,0 @@
Taken from Adélie Linux, fixes node on big endian ELFv2.
--- deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
+++ deps/v8/src/ppc/assembler-ppc.h 2019-04-02 07:05:25.977213735 +0000
@@ -48,7 +48,8 @@
#include "src/ppc/constants-ppc.h"
#if V8_HOST_ARCH_PPC && \
- (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
+ (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
+ (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
#define ABI_USES_FUNCTION_DESCRIPTORS 1
#else
#define ABI_USES_FUNCTION_DESCRIPTORS 0
@@ -60,13 +61,15 @@
#define ABI_PASSES_HANDLES_IN_REGS 0
#endif
-#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
+ (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
#define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
#else
#define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
#endif
-#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
+ (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
#define ABI_CALL_VIA_IP 1
#else
#define ABI_CALL_VIA_IP 0
@@ -220,7 +220,8 @@
// The following constants describe the stack frame linkage area as
// defined by the ABI. Note that kNumRequiredStackFrameSlots must
// satisfy alignment requirements (rounding up if required).
-#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
+ defined(_CALL_ELF) && _CALL_ELF == 2)
// [0] back chain
// [1] condition register save area
// [2] link register save area

14
srcpkgs/nodejs/template
View file

@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=11.14.0
revision=2
version=12.7.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)
@ -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=b903ba6dc8131b9357e7c5e26967a0f48aa460c708154244a6348d49a7d8ff9a
checksum=d5e63fd4ee88d539a69b9e71631d03014bd8e98596e741515e3d7aa930f4630a
build_options="ssl libuv http_parser icu nghttp2 cares"
desc_option_ssl="Enable shared libressl"
@ -46,8 +46,8 @@ do_configure() {
export LD="$CXX"
if [ "$CROSS_BUILD" ]; then
case "$XBPS_TARGET_MACHINE" in
aarch64*) _args="--dest-cpu=arm64 --without-snapshot" ;;
ppc64*) _args="--dest-cpu=ppc64 --without-snapshot" ;;
aarch64*) _args="--dest-cpu=arm64" ;;
ppc64*) _args="--dest-cpu=ppc64" ;;
*) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
esac
fi
@ -62,9 +62,7 @@ do_configure() {
post_configure() {
# Fix linking against llhttp
sed 's/http_parser/& -lllhttp/' \
-i out/cctest.target.mk \
-i out/node.target.mk
sed 's/-lhttp_parser/& -lllhttp/' -i out/*.target.mk
}
do_build() {