From de4d6249efecfc70198ea44e1c803c5ed0cbb453 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 29 Dec 2021 21:09:52 +1100
Subject: [PATCH 1/2] Do not use libtiff 4.3.0 on macOS builds

---
 config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index 087bd7652..9b58842fa 100644
--- a/config.sh
+++ b/config.sh
@@ -57,7 +57,7 @@ function pre_build {
     build_jpeg
     CFLAGS=$ORIGINAL_CFLAGS
 
-    if [[ -n "$IS_MACOS" && $MACOSX_DEPLOYMENT_TARGET == "11.0" ]]; then
+    if [[ -n "$IS_MACOS" ]]; then
         TIFF_VERSION=4.2.0
     fi
     build_tiff

From 136ab890c09a3534f11af998157e63d94d4a2480 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 29 Dec 2021 23:46:38 +1100
Subject: [PATCH 2/2] Limit numpy on 32-bit to 1.21.4 for Python 3.10 and
 1.20.3 for PyPy

---
 config.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config.sh b/config.sh
index 9b58842fa..97ae2bcd6 100644
--- a/config.sh
+++ b/config.sh
@@ -133,9 +133,11 @@ function run_tests {
         brew install openblas
         echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
     fi
-    if [[ "$MB_PYTHON_VERSION" == pypy3.7-* ]]; then
+    if [[ "$MB_PYTHON_VERSION" == pypy3.7-* ]] && [[ $(uname -m) == "i686" ]]; then
         python3 -m pip install numpy==1.20.3
-    elif [[ "$MB_PYTHON_VERSION" != 3.10 ]] || [[ "$PLAT" != "x86_64" ]]; then
+    elif [[ "$MB_PYTHON_VERSION" == 3.10 ]] && [[ $(uname -m) == "i686" ]]; then
+        python3 -m pip install numpy==1.21.4
+    else
         python3 -m pip install numpy
     fi