m/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-09 20:13:47 -05:00
Code Wiki Activity

Merge branch 'master' into download-aria2c

Browse Source
This commit is contained in:
Yamashita, Yuu
2016-05-26 09:28:45 +09:00
parent 8ea88dee1c 97da7c40e7
commit c71cf59f50
181 changed files with 1079 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/python-build/bin/pyenv-install
View File

@@ -200,7 +200,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
done
done
;;
"pypy-"*"-src" | "pypy3-"*"-src" )
"pypy-dev" | "pypy-"*"-src" | "pypy3-"*"-src" )
# PyPy/PyPy3 requires existing Python 2.7 to build
if [ -n "${PYENV_RPYTHON_VERSION}" ]; then
PYENV_BOOTSTRAP_VERSION="${PYENV_RPYTHON_VERSION}"

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

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Usage: python-build [-kvp] <definition> <prefix>
# Usage: python-build [-kpv] <definition> <prefix>
# python-build --definitions
# python-build --version
#
@@ -388,6 +388,9 @@ fetch_tarball() {
fi
if [ "$package_url" != "${package_url%xz}" ]; then
if ! type -p xz >/dev/null; then
echo "warning: xz not found; consider installing \`xz\` package" >&4
fi
package_filename="${package_filename%.gz}.xz"
tar_args="${tar_args/z/J}"
fi
@@ -410,6 +413,19 @@ fetch_tarball() {
} >&4 2>&1
}
fetch_nightly_tarball() {
local package_name="$1"
local package_url="$2"
local package_pattern="$3"
fetch_tarball "$1" "$2"
if [ ! -e "${package_name}" ]; then
local nightly_package_name="$(echo ${package_pattern})"
if [ -e "${nightly_package_name}" ]; then
ln -fs "${nightly_package_name}" "${package_name}"
fi
fi
}
reuse_existing_tarball() {
local package_filename="$1"
local checksum="$2"
@@ -1852,6 +1868,11 @@ if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-universalsdk"* ]]; then
package_option python configure --enable-universalsdk=/ --with-universal-archs=intel
fi
# Compile with `--enable-unicode=ucs4` by default (#257)
if [[ "$PYTHON_CONFIGURE_OPTS" != *"--enable-unicode="* ]]; then
package_option python configure --enable-unicode=ucs4
fi
# SSL Certificate error with older wget that does not support Server Name Indication (#60)
if ! command -v curl 1>/dev/null 2>&1 && [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then
echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2