From cfae353db20c68d6d8e8c7c9a70baac527b0df48 Mon Sep 17 00:00:00 2001 From: startergo <7897244+startergo@users.noreply.github.com> Date: Sun, 15 Oct 2023 07:35:57 -0400 Subject: [PATCH] Update and rename plugins/python-build/bin/python-build to plugins/python-build/bin/find / -name tcl.h 2>/dev/null Add conditional coding of `include` folder rather than hardcoded one. --- .../bin/{python-build => find / -name tcl.h 2>/dev/null} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename plugins/python-build/bin/{python-build => find / -name tcl.h 2>/dev/null} (99%) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/find / -name tcl.h 2>/dev/null similarity index 99% rename from plugins/python-build/bin/python-build rename to plugins/python-build/bin/find / -name tcl.h 2>/dev/null index eb6a7529..75f54407 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/find / -name tcl.h 2>/dev/null @@ -1645,7 +1645,10 @@ use_homebrew_tcltk() { if [[ -z "$PYTHON_BUILD_TCLTK_USE_PKGCONFIG" ]]; then local tcltk_version="$(sh -c '. '"$tcltk_libdir"'/lib/tclConfig.sh; echo $TCL_VERSION')" package_option python configure --with-tcltk-libs="-L$tcltk_libdir/lib -ltcl$tcltk_version -ltk$tcltk_version" - package_option python configure --with-tcltk-includes="-I$tcltk_libdir/include/tcl-tk" + if [ -d "-I$tcltk_libdir/include/tcl-tk" ]; then + package_option python configure --with-tcltk-includes="-I$tcltk_libdir/include/tcl-tk" + fi + package_option python configure --with-tcltk-includes="-I$tcltk_libdir/include" fi export PKG_CONFIG_PATH="${tcltk_libdir}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" fi