mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-08 11:33:49 -05:00
Merge pull request #3333 from nedbat/nedbat/314rc3
Add CPython 3.14.0rc3
This commit is contained in:
@@ -1508,7 +1508,9 @@ use_homebrew() {
|
|||||||
if command -v brew &>/dev/null; then
|
if command -v brew &>/dev/null; then
|
||||||
local brew_prefix="$(brew --prefix 2>/dev/null || true)"
|
local brew_prefix="$(brew --prefix 2>/dev/null || true)"
|
||||||
# /usr/local/lib:/usr/lib is the default library search path
|
# /usr/local/lib:/usr/lib is the default library search path
|
||||||
if [[ -n $brew_prefix && $brew_prefix != "/usr" && $brew_prefix != "/usr/local" ]]; then
|
if [[ -n $brew_prefix && ( ( $brew_prefix != "/usr" && $brew_prefix != "/usr/local" )
|
||||||
|
#when -isysroot is passed to Apple CLang, /usr/(local) are excluded from the default search path
|
||||||
|
|| ( is_mac && osx_using_default_compiler && $CFLAGS =~ (^|\ )-isysroot\ ) ) ]]; then
|
||||||
export CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-I${brew_prefix}/include"
|
export CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }-I${brew_prefix}/include"
|
||||||
append_ldflags_libs "-L${brew_prefix}/lib -Wl,-rpath,${brew_prefix}/lib"
|
append_ldflags_libs "-L${brew_prefix}/lib -Wl,-rpath,${brew_prefix}/lib"
|
||||||
lock_in homebrew
|
lock_in homebrew
|
||||||
@@ -1842,7 +1844,7 @@ use_homebrew_zlib() {
|
|||||||
|
|
||||||
use_xcode_sdk_zlib() {
|
use_xcode_sdk_zlib() {
|
||||||
# If a custom compiler is used, including XCode SDK will likely break it
|
# If a custom compiler is used, including XCode SDK will likely break it
|
||||||
[[ "${CC:-clang}" != "clang" || "$(command -v clang 2>/dev/null || true)" != "/usr/bin/clang" ]] && return 1
|
osx_using_default_compiler || return 1
|
||||||
|
|
||||||
local sdkroot="$(xcrun --sdk macosx --show-sdk-path 2>/dev/null || true)"
|
local sdkroot="$(xcrun --sdk macosx --show-sdk-path 2>/dev/null || true)"
|
||||||
[[ -z ${sdkroot} || ! -d ${sdkroot} ]] && return 1
|
[[ -z ${sdkroot} || ! -d ${sdkroot} ]] && return 1
|
||||||
@@ -1862,6 +1864,10 @@ use_xcode_sdk_zlib() {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
osx_using_default_compiler() {
|
||||||
|
[[ "${CC:-clang}" == "clang" && "$(command -v clang 2>/dev/null || true)" == "/usr/bin/clang" ]]
|
||||||
|
}
|
||||||
|
|
||||||
use_macports_zlib() {
|
use_macports_zlib() {
|
||||||
can_use_macports || return 1
|
can_use_macports || return 1
|
||||||
if [[ $(port -q installed zlib | awk '{print $3}') == "(active)" ]]; then
|
if [[ $(port -q installed zlib | awk '{print $3}') == "(active)" ]]; then
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
|
|||||||
install_package "openssl-3.5.1" "https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz#529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" mac_openssl --if has_broken_mac_openssl
|
install_package "openssl-3.5.1" "https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz#529043b15cffa5f36077a4d0af83f3de399807181d607441d734196d889b641f" mac_openssl --if has_broken_mac_openssl
|
||||||
install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
|
install_package "readline-8.2" "https://ftpmirror.gnu.org/readline/readline-8.2.tar.gz#3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" mac_readline --if has_broken_mac_readline
|
||||||
if has_tar_xz_support; then
|
if has_tar_xz_support; then
|
||||||
install_package "Python-3.14.0rc2" "https://www.python.org/ftp/python/3.14.0/Python-3.14.0rc2.tar.xz#bc62854cf232345bd22c9091a68464e01e056c6473a3fffa84572c8a342da656" standard verify_py314 copy_python_gdb ensurepip
|
install_package "Python-3.14.0rc3" "https://www.python.org/ftp/python/3.14.0/Python-3.14.0rc3.tar.xz#646dc945e49c73a141896deda12d43f3f293fd69426774c16fc43496180e8fcd" standard verify_py314 copy_python_gdb ensurepip
|
||||||
else
|
else
|
||||||
install_package "Python-3.14.0rc2" "https://www.python.org/ftp/python/3.14.0/Python-3.14.0rc2.tgz#b336f5d76fcf2725b29108f253d4338fbe4cc6a17cd8baf059deebb5a343dd8f" standard verify_py314 copy_python_gdb ensurepip
|
install_package "Python-3.14.0rc3" "https://www.python.org/ftp/python/3.14.0/Python-3.14.0rc3.tgz#f52c3fa94a02adf9a6228abf53f6a53f09ce06aa168d879a332054c598179853" standard verify_py314 copy_python_gdb ensurepip
|
||||||
fi
|
fi
|
||||||
Reference in New Issue
Block a user