From da3ac7b7a379652d1e3cd6c3b0adc2018f1a2a32 Mon Sep 17 00:00:00 2001 From: native-api Date: Thu, 7 Sep 2023 22:11:04 +0300 Subject: [PATCH] Prefer OpenSSL 3 in Homebrew since 3.12 (#2781) --- plugins/python-build/bin/python-build | 6 ++++++ plugins/python-build/share/python-build/3.12-dev | 2 +- plugins/python-build/share/python-build/3.12.0rc2 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 2e8bf1cf..2f1d8ebb 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1474,6 +1474,12 @@ prefer_openssl11() { export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA } +prefer_openssl3() { + # Allow overriding the preference of OpenSSL version per definition basis (#1302, #1325, #1326) + PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA="${PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA:-openssl@3 openssl@1.1 openssl}" + export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA +} + build_package_mac_readline() { # Install to a subdirectory since we don't want shims for bin/readline. READLINE_PREFIX_PATH="${PREFIX_PATH}/readline" diff --git a/plugins/python-build/share/python-build/3.12-dev b/plugins/python-build/share/python-build/3.12-dev index 8b9d23b2..7fbdcf5f 100644 --- a/plugins/python-build/share/python-build/3.12-dev +++ b/plugins/python-build/share/python-build/3.12-dev @@ -1,4 +1,4 @@ -prefer_openssl11 +prefer_openssl3 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1 export PYTHON_BUILD_CONFIGURE_WITH_DSYMUTIL=1 diff --git a/plugins/python-build/share/python-build/3.12.0rc2 b/plugins/python-build/share/python-build/3.12.0rc2 index 159e176e..1abccea1 100644 --- a/plugins/python-build/share/python-build/3.12.0rc2 +++ b/plugins/python-build/share/python-build/3.12.0rc2 @@ -1,4 +1,4 @@ -prefer_openssl11 +prefer_openssl3 export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1 install_package "openssl-3.1.1s" "https://www.openssl.org/source/openssl-3.1.1s.tar.gz#b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674" mac_openssl --if has_broken_mac_openssl install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline