mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-10 04:23:47 -05:00
Merge branch 'master' into download-aria2c
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user