Merge pull request #221 from regro-cf-autotick-bot/17.1.0_h425536

.ci_support/linux_aarch64_openssl1.1.1.yaml

@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '9'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-comp7
 icu:
 - '69'
 openssl:

.ci_support/linux_aarch64_openssl3.yaml

@@ -17,7 +17,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '9'
 docker_image:
-- quay.io/condaforge/linux-anvil-aarch64
+- quay.io/condaforge/linux-anvil-comp7
 icu:
 - '69'
 openssl:

conda-forge.yml

@@ -1,6 +1,7 @@
 build_platform:
   osx_arm64: osx_64
   linux_ppc64le: linux_64
+  linux_aarch64: linux_64
 provider:
   linux_aarch64: default
   linux_ppc64le: default

recipe/aarch64-trap-handler.patch

@@ -0,0 +1,27 @@
+From 0ae9f7a221b5ff347904eb0d1e88e0b87199eca2 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Fri, 26 Nov 2021 22:04:02 +0100
+Subject: [PATCH] trap handler doesn't work on linux cross-compile to arm
+
+---
+ deps/v8/src/trap-handler/trap-handler.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/deps/v8/src/trap-handler/trap-handler.h b/deps/v8/src/trap-handler/trap-handler.h
+index 0b3a6e0a70..363495129d 100644
+--- a/deps/v8/src/trap-handler/trap-handler.h
++++ b/deps/v8/src/trap-handler/trap-handler.h
+@@ -25,8 +25,8 @@ namespace trap_handler {
+ // Arm64 (non-simulator) on Mac.
+ #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
+ #define V8_TRAP_HANDLER_SUPPORTED true
+-// Arm64 simulator on x64 on Linux or Mac.
+-#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
++// Arm64 simulator on x64 on Mac.
++#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && V8_OS_MACOSX
+ #define V8_TRAP_HANDLER_VIA_SIMULATOR
+ #define V8_TRAP_HANDLER_SUPPORTED true
+ // Everything else is unsupported.
+-- 
+2.29.2
+

recipe/build.sh

@@ -49,7 +49,7 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then
            exit 1
            ;;
     esac
-    
+
     EXTRA_ARGS="--cross-compiling --dest-os=$DEST_OS --dest-cpu=$DEST_ARCH"
 fi
 

recipe/meta.yaml

@@ -1,23 +1,26 @@
-{% set version = "16.12.0" %}
+{% set version = "17.1.0" %}
 
 # NODE_MODULE_VERSION set in src/node_version.h
-{% set NODE_MODULE_VERSION = 93 %}
+{% set NODE_MODULE_VERSION = 102 %}
 
 package:
   name: nodejs
   version: {{ version }}
 
 source:
   url: https://nodejs.org/dist/v{{ version }}/node-v{{ version }}.tar.gz  # [not win]
-  sha256: bceb8098e276c6bb6b3e88223ed378a6c786491b6a3f6b22ae3fd8774724a9cb  # [not win]
+  sha256: a5676b96974926fdf4b0e3040e09a4ab4e91980d2d2091fa62b77e2f74be5d6e  # [not win]
   url: https://nodejs.org/dist/v{{ version }}/node-v{{ version }}-win-x64.zip  # [win]
-  sha256: 433206b42522e65ed6c0f30f1d665f336c2bdcfd200286da639c4e91ea602870  # [win]
+  sha256: de8d90d82af888efa0e7942204539d2fca731013a2d715da954db410df58be8f  # [win]
   patches:
     - linux-librt.patch  # [not win]
     - cinttypes.patch  # [linux]
     - less-shared-intermediate.patch  # [build_platform != target_platform]
     - 0001-Forward-ceilf-floorf.patch  # [not win]
     - 0001-Force-include-handler-outside-simulator.patch  # [osx and arm64]
+    - test-dep-shared-openssl.patch  # [not win]
+    - ppc-issignaling.patch  # [ppc64le]
+    - aarch64-trap-handler.patch  # [linux and aarch64]
 
 build:
   number: 1

recipe/ppc-issignaling.patch

@@ -0,0 +1,24 @@
+diff --git a/deps/v8/src/execution/ppc/simulator-ppc.cc b/deps/v8/src/execution/ppc/simulator-ppc.cc
+index 97e47bc0..3ac0cff8 100644
+--- a/deps/v8/src/execution/ppc/simulator-ppc.cc
++++ b/deps/v8/src/execution/ppc/simulator-ppc.cc
+@@ -4751,7 +4751,8 @@ void Simulator::ExecuteGeneric(Instruction* instr) {
+           bit_cast<float, uint32_t>(static_cast<uint32_t>(double_bits >> 32));
+       double_bits = bit_cast<uint64_t, double>(static_cast<double>(f));
+       // Preserve snan.
+-      if (issignaling(f)) {
++      float snan = std::numeric_limits<float>::signaling_NaN();
++      if (std::memcmp(&snan, &f, sizeof(float)) == 0) {
+         double_bits &= 0xFFF7FFFFFFFFFFFFU;  // Clear bit 51.
+       }
+       set_d_register(t, double_bits);
+@@ -4764,7 +4765,8 @@ void Simulator::ExecuteGeneric(Instruction* instr) {
+       uint64_t float_bits = static_cast<uint64_t>(
+           bit_cast<uint32_t, float>(static_cast<float>(b_val)));
+       // Preserve snan.
+-      if (issignaling(b_val)) {
++      double snan = std::numeric_limits<double>::signaling_NaN();
++      if (std::memcmp(&snan, &b_val, sizeof(double)) == 0) {
+         float_bits &= 0xFFBFFFFFU;  // Clear bit 22.
+       }
+       // fp result is placed in both 32bit halfs of the dst.

recipe/test-dep-shared-openssl.patch

@@ -0,0 +1,26 @@
+From a21683deb08bcf908292ba32c02c42828b78ef75 Mon Sep 17 00:00:00 2001
+From: Min RK <benjaminrk@gmail.com>
+Date: Wed, 24 Nov 2021 22:06:27 +0100
+Subject: [PATCH] test_crypto_engine: depends on non-shared openssl, only build
+ with non-shared openssl
+
+---
+ node.gyp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/node.gyp b/node.gyp
+index d2337823a8..0a3c7a1c31 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -1475,7 +1475,7 @@
+     }], # end aix section
+     # TODO(RaisinTen): Enable this to build on other platforms as well.
+     ['(OS=="mac" or (OS=="linux" and target_arch=="x64")) and \
+-      node_use_openssl=="true"', {
++      node_use_openssl=="true" and node_shared_openssl=="false"', {
+       'targets': [
+         {
+           'target_name': 'test_crypto_engine',
+-- 
+2.29.2
+