1
0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-10 12:33:48 -05:00

Find zlib from Xcode or brew on Mojave (#1353)

fixes #1219, #1333
This commit is contained in:
Mikhail Bulash
2019-06-11 17:12:00 +03:00
committed by Josh Friend
parent 2350e57b00
commit 4157973301
4 changed files with 39 additions and 13 deletions

View File

@@ -65,7 +65,7 @@ assert_build_log() {
# pyenv/pyenv#1026
stub uname false false
stub uname '-s : echo Linux'
stub uname '-s : echo Linux' '-s : echo Linux'
stub brew false
stub_make_install
stub_make_install
@@ -95,7 +95,7 @@ OUT
# pyenv/pyenv#1026
stub uname false false
stub uname '-s : echo Linux'
stub uname '-s : echo Linux' '-s : echo Linux'
stub brew false
stub_make_install
stub_make_install
@@ -125,7 +125,7 @@ OUT
cached_tarball "yaml-0.1.6"
cached_tarball "Python-3.6.2"
stub uname '-s : echo Linux'
stub uname '-s : echo Linux' '-s : echo Linux'
stub brew false
stub_make_install
stub_make_install
@@ -164,6 +164,7 @@ OUT
stub uname false false
stub uname '-s : echo Linux'
stub uname '-s : echo Darwin'
stub brew "--prefix libyaml : echo '$brew_libdir'" false
stub_make_install
@@ -251,7 +252,7 @@ OUT
# yyuu/pyenv#257
stub uname '-s : echo Darwin'
stub uname '-s : echo Darwin' false
stub uname '-s : echo Darwin' false '-s : echo Darwin'
stub sysctl false
stub_make_install
@@ -282,7 +283,7 @@ OUT
# yyuu/pyenv#257
stub uname '-s : echo Darwin'
stub uname '-s : echo Darwin' false
stub uname '-s : echo Darwin' false '-s : echo Darwin'
stub sysctl '-n hw.ncpu : echo 4'
stub_make_install
@@ -310,7 +311,7 @@ OUT
# pyenv/pyenv#1026
stub uname false false
stub uname '-s : echo FreeBSD' false
stub uname '-s : echo FreeBSD' false false
stub sysctl '-n hw.ncpu : echo 1'
stub_make_install
@@ -336,7 +337,7 @@ OUT
cached_tarball "Python-3.6.2"
# pyenv/pyenv#1026
stub uname false false
stub uname false false false
stub uname '-s : echo Linux'
stub_make_install
@@ -362,7 +363,7 @@ OUT
cached_tarball "Python-3.6.2"
# pyenv/pyenv#1026
stub uname false false
stub uname false false false
stub uname '-s : echo Linux'
stub_make_install
@@ -399,7 +400,7 @@ OUT
stub uname "-s : echo FreeBSD" "-r : echo 9.1" false
# pyenv/pyenv#1026
stub uname false false
stub uname false false false
MAKE=gmake stub_make_install
@@ -416,7 +417,7 @@ OUT
stub uname "-s : echo FreeBSD" "-r : echo 10.0-RELEASE" false
# pyenv/pyenv#1026
stub uname false false
stub uname false false false
stub_make_install
@@ -432,7 +433,7 @@ OUT
stub uname "-s : echo FreeBSD" "-r : echo 11.0-RELEASE" false
# pyenv/pyenv#1026
stub uname false false
stub uname false false false
stub_make_install
@@ -458,6 +459,7 @@ CONF
# yyuu/pyenv#257
stub uname '-s : echo Linux'
stub uname '-s : echo Linux'
stub uname '-s : echo Linux'
export PYTHON_CONFIGURE="${TMP}/custom-configure"
run_inline_definition <<DEF

View File

@@ -64,9 +64,11 @@ DEF
cd "$INSTALL_ROOT"
# pyenv/pyenv#1026
stub uname false '-s : echo Darwin' false '-s : echo Darwin'
stub uname false '-s : echo Darwin' false '-s : echo Darwin' '-s : echo Darwin'
stub sw_vers '-productVersion : echo 10.10'
stub sw_vers '-productVersion : echo 10.10'
stub sw_vers '-productVersion : echo 10.10'
stub sw_vers '-productVersion : echo 10.10'
stub cc 'false'
stub brew 'false'