setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: prefer homebrew openssl 1.1.x over 1.0.x, see #839

Browse Source 
previously, it was not possibly to compile a python with homebrew
openssl 1.1 because the code always queried "openssl" and ignored
"openssl@1.1".

now, if 1.1 is installed, it is used to compile python and only
if it is not, 1.0 is checked and used.
This commit is contained in:
Thomas Waldmann 2019-03-16 21:17:43 +01:00
parent 7d02b2463b
commit dda597efb3
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1492,15 +1492,20 @@ has_broken_mac_openssl() {
} }
use_homebrew_openssl() { use_homebrew_openssl() {
local ssldir="$(brew --prefix openssl 2>/dev/null || true)" local ssl11dir="$(brew --prefix openssl@1.1 2>/dev/null || true)"
if [ -d "$ssldir" ]; then local ssl10dir="$(brew --prefix openssl 2>/dev/null || true)"
echo "python-build: use openssl from homebrew" if [ -d "$ssl11dir" ]; then
export PKG_CONFIG_PATH="$ssldir/lib/pkgconfig/:${PKG_CONFIG_PATH}" echo "python-build: use openssl 1.1 from homebrew"
export CPPFLAGS="-I$ssldir/include ${CPPFLAGS}" local ssldir=$ssl11dir
export LDFLAGS="-L$ssldir/lib ${LDFLAGS}" elif [ -d "$ssl10dir" ]; then
echo "python-build: use openssl 1.0 from homebrew"
local ssldir=$ssl10dir
else else
return 1 return 1
fi fi
export PKG_CONFIG_PATH="$ssldir/lib/pkgconfig/:${PKG_CONFIG_PATH}"
export CPPFLAGS="-I$ssldir/include ${CPPFLAGS}"
export LDFLAGS="-L$ssldir/lib ${LDFLAGS}"
} }
build_package_mac_openssl() { build_package_mac_openssl() {