From fb43ea9949a0712d4d9a5a2614746d0636441db0 Mon Sep 17 00:00:00 2001 From: Dag Heyman Date: Mon, 15 Feb 2021 14:32:45 +0100 Subject: [PATCH 1/3] macOS: bump openssl and python --- .github/workflows/macOS.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 430127b9..2e58df9b 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -3,11 +3,11 @@ name: macOS on: [push, pull_request] env: - PYTHON_VER: '3.8.3' + PYTHON_VER: '3.8.7' PYTHON_VER_SHORT: '3.8' PYTHON_VER_SHORT_COMPACT: '38' PYOTHERSIDE_VER: '1.5.9' - OPENSSL_VER: '1.1.1g' + OPENSSL_VER: '1.1.1i' jobs: build: @@ -64,9 +64,6 @@ jobs: /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 download pyscard --no-binary :all: tar -xvf pyscard* rm pyscard-2.0.0.tar.gz - cd pyscard* - patch setup.py ../.github/workflows/macos-pyscard-patch.patch - cd .. sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 install ./pyscard* --no-binary :all: --ignore-installed --force-reinstall --no-cache sudo env MACOSX_DEPLOYMENT_TARGET=10.13 CFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" /Library/Frameworks/Python.framework/Versions/3.8/bin/pip3.8 install -r requirements.txt --no-binary :all: From af661f3ffb269cf83eb819f77019e69a65533578 Mon Sep 17 00:00:00 2001 From: Dag Heyman Date: Tue, 16 Feb 2021 10:51:43 +0100 Subject: [PATCH 2/3] macos: uninstall brew libffi --- .github/workflows/macOS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index 2e58df9b..e282e3d2 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -52,7 +52,7 @@ jobs: # Make sure gettext is not installed when configuring Python, # otherwise it seems to break the linking for PyOtherSide build later. # Re-intall after, because it's needed for wget. - brew uninstall gettext --ignore-dependencies + brew uninstall gettext libffi --ignore-dependencies ./configure MACOSX_DEPLOYMENT_TARGET=10.13 CPPFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" CC=clang --enable-framework --with-openssl=/opt/openssl --enable-optimizations sudo make altinstall brew reinstall gettext From 3ec895518729c80d493b6f0af3cc7eda254e1c10 Mon Sep 17 00:00:00 2001 From: Dag Heyman Date: Tue, 16 Feb 2021 12:07:47 +0100 Subject: [PATCH 3/3] try ystem ffi --- .github/workflows/macOS.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index e282e3d2..6b63d803 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -53,7 +53,7 @@ jobs: # otherwise it seems to break the linking for PyOtherSide build later. # Re-intall after, because it's needed for wget. brew uninstall gettext libffi --ignore-dependencies - ./configure MACOSX_DEPLOYMENT_TARGET=10.13 CPPFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" CC=clang --enable-framework --with-openssl=/opt/openssl --enable-optimizations + ./configure MACOSX_DEPLOYMENT_TARGET=10.13 CPPFLAGS="-I/opt/openssl/include" LDFLAGS="-L/opt/openssl/lib" CC=clang --enable-framework --with-openssl=/opt/openssl --enable-optimizations --with-system-ffi sudo make altinstall brew reinstall gettext