mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-21 20:47:00 -05:00
Prefer OpenSSL 3 in Homebrew since 3.12 (#2781)
This commit is contained in:
parent
259b5cad26
commit
da3ac7b7a3
3 changed files with 8 additions and 2 deletions
|
@ -1474,6 +1474,12 @@ prefer_openssl11() {
|
||||||
export PYTHON_BUILD_HOMEBREW_OPENSSL_FORMULA
|
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() {
|
build_package_mac_readline() {
|
||||||
# Install to a subdirectory since we don't want shims for bin/readline.
|
# Install to a subdirectory since we don't want shims for bin/readline.
|
||||||
READLINE_PREFIX_PATH="${PREFIX_PATH}/readline"
|
READLINE_PREFIX_PATH="${PREFIX_PATH}/readline"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
prefer_openssl11
|
prefer_openssl3
|
||||||
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
|
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
|
||||||
export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
|
export PYTHON_BUILD_TCLTK_USE_PKGCONFIG=1
|
||||||
export PYTHON_BUILD_CONFIGURE_WITH_DSYMUTIL=1
|
export PYTHON_BUILD_CONFIGURE_WITH_DSYMUTIL=1
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
prefer_openssl11
|
prefer_openssl3
|
||||||
export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
|
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 "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
|
install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
|
||||||
|
|
Loading…
Reference in a new issue