From 087f0f8184d9b831576f7f49177b0597e602be72 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 2 Aug 2019 15:24:43 +0200 Subject: [PATCH] nodejs: update to 12.7.0. --- srcpkgs/nodejs/patches/ppc64.patch | 41 ------------------------------ srcpkgs/nodejs/template | 14 +++++----- 2 files changed, 6 insertions(+), 49 deletions(-) delete mode 100644 srcpkgs/nodejs/patches/ppc64.patch diff --git a/srcpkgs/nodejs/patches/ppc64.patch b/srcpkgs/nodejs/patches/ppc64.patch deleted file mode 100644 index 8190db1ce6f..00000000000 --- a/srcpkgs/nodejs/patches/ppc64.patch +++ /dev/null @@ -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 diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index e3066682b55..a4f7cce36e1 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -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 " 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() {