Mirrors/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2026-06-06 00:48:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix linking against a keg_only Homebrew OpenSSL when a a non-keg_only one is also installed (#3462)

Browse Source
This commit is contained in:
native-api 2026-05-30 16:53:57 +03:00 committed by GitHub
parent 7f1139ebe6
commit 549a644688
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/python-build/bin/python-build
View File

@ -1721,22 +1721,28 @@ use_homebrew_openssl() {
local ssldir="$(brew --prefix "${openssl}" || true)" local ssldir="$(brew --prefix "${openssl}" || true)"
if [ -d "$ssldir" ]; then if [ -d "$ssldir" ]; then
echo "python-build: use ${openssl} from homebrew" echo "python-build: use ${openssl} from homebrew"
# Since 970acdcad3be4262451e9a5180a385dd2158eda3 (openssl@3 3.1.1),
# Homebrew's openssl@3 is no longer keg-only.
# Python's --with-openssl* appends flags to the compiler's command line,
# which in combination with adding Homebrew's general dir to flags
# always causes the build to link to the non-keg `openssl'
# when the non-keg-only formula is installed.
# To counter that, we have to prepend the openssl path to flags
# regardless of using Configure options.
if [[ -n "${PYTHON_BUILD_CONFIGURE_WITH_OPENSSL:-}" ]]; then if [[ -n "${PYTHON_BUILD_CONFIGURE_WITH_OPENSSL:-}" ]]; then
# configure script of newer CPython versions support `--with-openssl` # configure script of newer CPython versions support `--with-openssl`
# https://bugs.python.org/issue21541 # https://bugs.python.org/issue21541
package_option python configure --with-openssl="${ssldir}" package_option python configure --with-openssl="${ssldir}"
else
export CPPFLAGS="-I$ssldir/include ${CPPFLAGS:+ $CPPFLAGS}"
export LDFLAGS="-L$ssldir/lib${LDFLAGS:+ $LDFLAGS}"
fi fi
# 3.10.0+ (https://github.com/python/cpython/pull/24820) # 3.10.0+ (https://github.com/python/cpython/pull/24820)
# but has no effect until 3.11.0 (b9e9292d75fdea621e05e39b8629e6935d282d0d) # but has no effect until 3.11.0 (b9e9292d75fdea621e05e39b8629e6935d282d0d)
# and broken in MacOS until 3.12.2 (cc13eabc7ce08accf49656e258ba500f74a1dae8) # and broken in MacOS until 3.12.2 (cc13eabc7ce08accf49656e258ba500f74a1dae8)
if [[ -n $PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH ]]; then if [[ -n $PYTHON_BUILD_CONFIGURE_WITH_OPENSSL_RPATH ]]; then
package_option python configure --with-openssl-rpath="${ssldir}/lib" package_option python configure --with-openssl-rpath="${ssldir}/lib"
else
prepend_ldflags_libs "-Wl,-rpath,${ssldir}/lib"
fi fi
export CPPFLAGS="-I${ssldir}/include ${CPPFLAGS:+ $CPPFLAGS}"
export LDFLAGS="-L${ssldir}/lib -Wl,-rpath,${ssldir}/lib${LDFLAGS:+ $LDFLAGS}"
export PKG_CONFIG_PATH="$ssldir/lib/pkgconfig/:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="$ssldir/lib/pkgconfig/:${PKG_CONFIG_PATH}"
lock_in homebrew lock_in homebrew