Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macOS: bump openssl and python #258

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

macOS: bump openssl and python #258

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb43ea9
macOS: bump openssl and python
dagheyman Feb 15, 2021
af661f3
macos: uninstall brew libffi
dagheyman Feb 16, 2021
3ec8955
try ystem ffi
dagheyman Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/macOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -52,8 +52,8 @@ 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
./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
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 --with-system-ffi
sudo make altinstall
brew reinstall gettext

Expand All @@ -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:

Expand Down