From 7e5e46c9cc1f3dcc0794c193e284886495b25567 Mon Sep 17 00:00:00 2001
From: Alex Arslan <ararslan@comcast.net>
Date: Sun, 30 Aug 2020 13:22:42 -0700
Subject: [PATCH 1/2] Add FreeBSD and AArch64 Linux to Travis CI

Also move the Homebrew package installation on macOS to the `homebrew`
addon.
---
 .travis.yml | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c63b80d4..e83be972 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,28 +4,50 @@ matrix:
   include:
     - os: linux
       compiler: gcc
+      arch: amd64
       addons:
         apt:
           packages:
             - libtommath-dev
     - os: linux
       compiler: clang
+      arch: amd64
       addons:
         apt:
           packages:
             - libtommath-dev
             - clang-3.9
+    - os: linux
+      compiler: gcc
+      arch: arm64
+      addons:
+        apt:
+          packages:
+            - libtommath-dev
     - os: osx
       image: xcode8
+      addons:
+        homebrew:
+          packages:
+            - libtommath
+            - concurrencykit
     - os: osx
       image: xcode11.2
+      addons:
+        homebrew:
+          packages:
+            - libtommath
+            - concurrencykit
+    - os: freebsd
+      addons:
+        pkg:
+          packages:
+            - sudo
+            - libtommath
+            - concurrencykit
 notifications:
   email: false
 before_install:
-  - if [ "$(uname)" = "Darwin" ]; then
-      brew update;
-      brew install -v libtommath concurrencykit;
-    fi
   - |
       git clone https://github.com/concurrencykit/ck.git ${HOME}/ck
       cd ${HOME}/ck

From d4f70e9607d32c406f748f6777fd15ad8ab008d8 Mon Sep 17 00:00:00 2001
From: Alex Arslan <ararslan@comcast.net>
Date: Sun, 30 Aug 2020 14:15:54 -0700
Subject: [PATCH 2/2] Try to get FreeBSD to stop being classified as macOS

Also set things up to use `gmake` instead of `make` since the latter
refers to the incompatible BSD Make rather than GNU Make on BSD.
Hopefully the alias persists across build steps...
---
 .travis.yml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e83be972..0dcacd2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,14 @@ matrix:
         apt:
           packages:
             - libtommath-dev
+    - os: freebsd
+      addons:
+        pkg:
+          packages:
+            - sudo
+            - gmake
+            - libtommath
+            - concurrencykit
     - os: osx
       image: xcode8
       addons:
@@ -38,32 +46,26 @@ matrix:
           packages:
             - libtommath
             - concurrencykit
-    - os: freebsd
-      addons:
-        pkg:
-          packages:
-            - sudo
-            - libtommath
-            - concurrencykit
 notifications:
   email: false
 before_install:
+  - [ "$(uname)" = "FreeBSD" ] || alias gmake=make
   - |
       git clone https://github.com/concurrencykit/ck.git ${HOME}/ck
       cd ${HOME}/ck
       git checkout 0.6.0
       ./configure PREFIX=/usr
-      make all
-      sudo make install
+      gmake all
+      sudo gmake install
       if [ "$(uname)" = "Linux" ]; then
         sudo ldconfig
       fi
   - |
       git clone https://github.com/justinethier/cyclone-bootstrap.git ${HOME}/cyclone-bootstrap
       cd ${HOME}/cyclone-bootstrap
-      make
-      sudo make install
+      gmake
+      sudo gmake install
 script:
-  - make
-  - sudo make install
-  - make test
+  - gmake
+  - sudo gmake install
+  - gmake test