From 8b9b95bf5ccb72ecb3af7334d9473ad93895d819 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 6 May 2021 14:18:52 +1000
Subject: [PATCH 1/4] Added Python 3.8 for arm64

---
 .github/workflows/wheels.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 92638ee7a..4c12d79e2 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -33,6 +33,11 @@ jobs:
 #            os-name: "osx"
 #            platform: "arm64"
 #            python: "3.9"
+#            macos-target: "11.0"
+#          - os: "macos-11.0"
+#            os-name: "osx"
+#            platform: "arm64"
+#            python: "3.8"
 #            macos-target: "11.0"
     env:
       BUILD_COMMIT: HEAD
@@ -82,6 +87,11 @@ jobs:
             platform: "arm64"
             python: "3.9"
             macos-target: "11.0"
+          - os: "macos-11.0"
+            os-name: "osx"
+            platform: "arm64"
+            python: "3.8"
+            macos-target: "11.0"
     env:
       BUILD_COMMIT: master
       PLAT: ${{ matrix.platform }}

From 6bb4dfcf905d50a4f1280898b18d760ffa369e02 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 19 May 2021 20:30:06 +1000
Subject: [PATCH 2/4] Updated multibuild to upgrade Python 3.8 default to
 3.8.10

---
 multibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multibuild b/multibuild
index 63c1418ea..125a047df 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit 63c1418ea5236f2586007c5397dab1d99d4cf1dd
+Subproject commit 125a047dfd81f6d22815f91cae8cdef1f81f02ac

From 88a8459b41256aee075b946dbcbcc1292fb4be43 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 13 May 2021 21:07:20 +1000
Subject: [PATCH 3/4] Fixed untar on macOS 11

---
 config.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index 2e2a35d23..a4e36eb04 100644
--- a/config.sh
+++ b/config.sh
@@ -28,7 +28,14 @@ function untar {
         gz|tgz) tar -zxf $in_fname ;;
         bz2) tar -jxf $in_fname ;;
         zip) unzip -qq $in_fname ;;
-        xz) unxz -c $in_fname | tar -xf - ;;
+        xz) if [ -n "$IS_MACOS" ]; then
+              tar -xf $in_fname
+            else
+              if [[ ! $(type -P "unxz") ]]; then
+                echo xz must be installed to uncompress file; exit 1
+              fi
+              unxz -c $in_fname | tar -xf -
+            fi ;;
         *) echo Did not recognize extension $extension; exit 1 ;;
     esac
 }

From 34b2e34ea0143c86b8863ba6b92516e5bf2ef2c2 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 29 May 2021 17:37:51 +1000
Subject: [PATCH 4/4] Disable macos-11.0 whilst not available for this repo

---
 .github/workflows/wheels.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 4c12d79e2..9a7395307 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -82,16 +82,17 @@ jobs:
             os-name: "osx"
           - os: "ubuntu-20.04"
             os-name: "focal"
-          - os: "macos-11.0"
-            os-name: "osx"
-            platform: "arm64"
-            python: "3.9"
-            macos-target: "11.0"
-          - os: "macos-11.0"
-            os-name: "osx"
-            platform: "arm64"
-            python: "3.8"
-            macos-target: "11.0"
+# Disable whilst not available
+#          - os: "macos-11.0"
+#            os-name: "osx"
+#            platform: "arm64"
+#            python: "3.9"
+#            macos-target: "11.0"
+#          - os: "macos-11.0"
+#            os-name: "osx"
+#            platform: "arm64"
+#            python: "3.8"
+#            macos-target: "11.0"
     env:
       BUILD_COMMIT: master
       PLAT: ${{ matrix.platform }}