diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 143c8c41..7450c679 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -24,7 +24,7 @@ jobs: # python-version: ${{ matrix.python-version }} # ... but in the repo, we want to test pyenv builds on macOS - run: | - brew install openssl readline sqlite3 xz zlib + brew install openssl readline sqlite3 xz tcl-tk@8 libb2 zstd # https://github.com/pyenv/pyenv#installation - run: pwd - env: diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index f7162376..27e793eb 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -863,7 +863,7 @@ build_package_standard_build() { use_homebrew_readline || true use_homebrew_ncurses || true if is_mac -ge 1014; then - use_xcode_sdk_zlib || use_homebrew_zlib || true + use_homebrew_zlib || use_xcode_sdk_zlib || true else use_homebrew_zlib || true fi @@ -873,7 +873,7 @@ build_package_standard_build() { use_macports_readline || true use_macports_ncurses || true if is_mac -ge 1014; then - use_xcode_sdk_zlib || use_macports_zlib || true + use_macports_zlib || use_xcode_sdk_zlib || true else use_macports_zlib || true fi @@ -1820,7 +1820,8 @@ use_homebrew_zlib() { local brew_zlib="$(brew --prefix zlib 2>/dev/null || true)" if [ -d "$brew_zlib" ]; then echo "python-build: use zlib from homebrew" - export CFLAGS="-I${brew_zlib} ${CFLAGS}" + export CPPFLAGS="-I${brew_zlib}/include${CPPFLAGS:+ ${CPPFLAGS}}" + export LDFLAGS="-L${brew_zlib}/lib${LDFLAGS:+ ${LDFLAGS}}" lock_in homebrew fi }