mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-10 04:23:47 -05:00
Discover Tcl/Tk reliably and use active version (#2106)
Link to the active version like other Homebrew deps -- this won't break when another binary-compatible version is installed. Use a discovery method that doesn't break when other versions are present alongside.
This commit is contained in:
@@ -242,18 +242,15 @@ OUT
|
||||
|
||||
@test "tcl-tk is linked from Homebrew" {
|
||||
cached_tarball "Python-3.6.2"
|
||||
|
||||
# python build
|
||||
tcl_tk_version=8.6
|
||||
tcl_tk_libdir="$TMP/homebrew-tcl-tk"
|
||||
tcl_tk_version_long="8.6.10"
|
||||
tcl_tk_version="${tcl_tk_version_long%.*}"
|
||||
mkdir -p "$tcl_tk_libdir"
|
||||
mkdir -p "$tcl_tk_libdir/$tcl_tk_version_long"
|
||||
mkdir -p "$tcl_tk_libdir/lib"
|
||||
echo "TCL_VERSION='$tcl_tk_version'" >>"$tcl_tk_libdir/lib/tclConfig.sh"
|
||||
|
||||
# pyenv/pyenv#1026
|
||||
stub uname false false
|
||||
stub uname false
|
||||
|
||||
stub brew "--prefix tcl-tk : echo '$tcl_tk_libdir'" "--cellar tcl-tk : echo '$TMP/homebrew-tcl-tk'" false
|
||||
for i in {1..2}; do stub brew "--prefix tcl-tk : echo '$tcl_tk_libdir'"; done
|
||||
stub brew false
|
||||
stub_make_install
|
||||
|
||||
run_inline_definition <<DEF
|
||||
|
||||
Reference in New Issue
Block a user