v0.4.0-20131217

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 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
 
 * python-build: Add new CPython releases; 3.3.3 (#80)

libexec/pyenv---version

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

plugins/python-build/bin/python-build

@@ -920,19 +920,17 @@ use_homebrew_yaml() {
 }
 
 has_broken_mac_readline() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    use_homebrew_readline || {
-      # MacOSX 10.4 has a broken readline.
-      # https://github.com/yyuu/pyenv/issues/23
-      local retval=1
-      local conftest="$BUILD_PATH/has_broken_mac_readline.h"
-      if [ "$(uname -s)" = "Darwin" ]; then
-        echo "#include <readline/rlconf.h>" > "$conftest"
-        "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
-        rm -f "$conftest"
-      fi
-      return "$retval"
-    }
+  if [ "$(uname -s)" = "Darwin" ] && ! use_homebrew_readline; then
+    # MacOSX 10.4 has a broken readline.
+    # https://github.com/yyuu/pyenv/issues/23
+    local retval=1
+    local conftest="$BUILD_PATH/has_broken_mac_readline.h"
+    if [ "$(uname -s)" = "Darwin" ]; then
+      echo "#include <readline/rlconf.h>" > "$conftest"
+      "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
+      rm -f "$conftest"
+    fi
+    return "$retval"
   else
     return 1
   fi
@@ -1054,6 +1052,11 @@ isolated_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() {
   # Check the existence of ./bin since pyenv-which searches the executables from there
   if [ ! -d "${PREFIX_PATH}/bin" ]; then