Merge pull request #225 from minrk/cross-compile-arm

16.x: Cross-compile aarch64
conda-forge · Dec 1, 2021 · 49f16e7 · 49f16e7
2 parents d2abb3d + aa90573
commit 49f16e7
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 76 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_aarch64_openssl1.1.1.yaml b/.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:

diff --git a/.ci_support/linux_aarch64_openssl3.yaml b/.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:

diff --git a/.drone.yml b/.drone.yml
diff --git a/.gitattributes b/.gitattributes
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/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

diff --git a/recipe/aarch64-trap-handler.patch b/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
+
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -18,9 +18,10 @@ source:
     - 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]
+    - aarch64-trap-handler.patch  # [linux and aarch64]
 
 build:
-  number: 0
+  number: 1
   # Prefix replacement breaks in the binary embedded configurations.
   detect_binary_files_with_prefix: false
   run_exports: