Compile for aarch64-linux

fontist · Mar 28, 2022 · e788adc · e788adc
1 parent d60f56c
commit e788adc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,7 +2,7 @@ name: tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main, master ]
   pull_request:
   workflow_dispatch:
 
@@ -25,10 +25,12 @@ jobs:
             platform: x86-linux
           - os: ubuntu-latest
             platform: x86_64-linux
+          - os: ubuntu-latest
+            platform: aarch64-linux
           - os: ubuntu-latest
             platform: any
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -50,7 +52,7 @@ jobs:
           path: tmp/*/ports/*/*/*.log
 
       - if: matrix.platform != 'any'
-        uses: metanorma/metanorma-build-scripts/native-deps-action@master
+        uses: metanorma/metanorma-build-scripts/native-deps-action@main
         with:
           libname: archive
           directory: lib/ffi-libarchive-binary
@@ -91,7 +93,7 @@ jobs:
             platform: x86_64-linux
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -122,10 +124,12 @@ jobs:
           - os: ubuntu-latest
             platform: x86_64-linux
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
         with:
           repository: metanorma/metanorma
 
+      - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
+
       - uses: actions/download-artifact@v2
         with:
           name: pkg

diff --git a/Rakefile b/Rakefile
@@ -21,6 +21,7 @@ platforms = [
   ["x64-mingw32", "x86_64-w64-mingw32", "libarchive-13.dll"],
   ["x86-linux", "i686-linux-gnu", "libarchive.so"],
   ["x86_64-linux", "x86_64-linux-gnu", "libarchive.so"],
+  ["aarch64-linux", "aarch64-linux-gnu", "libarchive.so"],
   ["x86_64-darwin", "x86_64-darwin", "libarchive.dylib"],
   ["arm64-darwin", "arm64-darwin", "libarchive.dylib"],
 ]

diff --git a/lib/ffi-libarchive-binary/libarchive_recipe.rb b/lib/ffi-libarchive-binary/libarchive_recipe.rb
@@ -89,7 +89,10 @@ def cook_if_not
     end
 
     def cook
+      @zlib_recipe.host = @host if @host
       @zlib_recipe.cook_if_not
+
+      @expat_recipe.host = @host if @host
       @expat_recipe.cook_if_not
 
       super