1
0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-15 14:53:53 -05:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Yamashita Yuu
3d5156ed1d v0.4.0-20131217 2013-12-17 11:46:44 +09:00
Yamashita Yuu
aa76fd2f9c On Darwin, should not build readline if there is brewed readline 2013-12-16 16:27:45 +09:00
Yamashita Yuu
db141f66a4 Restored has_broken_mac_llvm_gcc which is required to build 3.3+ on Darwin 2013-12-16 16:24:25 +09:00
3 changed files with 22 additions and 14 deletions

View File

@@ -1,5 +1,10 @@
## Version History ## Version History
#### 0.4.0-20131217
* python-build: Fix broken build of CPython 3.3+ on Darwin
* python-build: Not build GNU Readline uselessly on Darwin
#### 0.4.0-20131216 #### 0.4.0-20131216
* python-build: Add new CPython releases; 3.3.3 (#80) * python-build: Add new CPython releases; 3.3.3 (#80)

View File

@@ -12,7 +12,7 @@
set -e set -e
[ -n "$PYENV_DEBUG" ] && set -x [ -n "$PYENV_DEBUG" ] && set -x
version="0.4.0-20131216" version="0.4.0-20131217"
cd "$PYENV_ROOT" cd "$PYENV_ROOT"
git_revision="$(git describe --tags HEAD 2>/dev/null || true)" git_revision="$(git describe --tags HEAD 2>/dev/null || true)"

View File

@@ -920,8 +920,7 @@ use_homebrew_yaml() {
} }
has_broken_mac_readline() { has_broken_mac_readline() {
if [ "$(uname -s)" = "Darwin" ]; then if [ "$(uname -s)" = "Darwin" ] && ! use_homebrew_readline; then
use_homebrew_readline || {
# MacOSX 10.4 has a broken readline. # MacOSX 10.4 has a broken readline.
# https://github.com/yyuu/pyenv/issues/23 # https://github.com/yyuu/pyenv/issues/23
local retval=1 local retval=1
@@ -932,7 +931,6 @@ has_broken_mac_readline() {
rm -f "$conftest" rm -f "$conftest"
fi fi
return "$retval" return "$retval"
}
else else
return 1 return 1
fi fi
@@ -1054,6 +1052,11 @@ isolated_gem_install() {
gem install "$@" gem install "$@"
} }
has_broken_mac_llvm_gcc() {
[ "$(uname -s)" = "Darwin" ] &&
[[ "$(gcc --version 2>/dev/null || true)" == *"llvm-gcc-4.2"* ]]
}
build_package_verify_python() { build_package_verify_python() {
# Check the existence of ./bin since pyenv-which searches the executables from there # Check the existence of ./bin since pyenv-which searches the executables from there
if [ ! -d "${PREFIX_PATH}/bin" ]; then if [ ! -d "${PREFIX_PATH}/bin" ]; then