From cc4b6808b02ae086f263927c16b17ccc217ab4b9 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 4 Dec 2020 22:28:06 -0500 Subject: [PATCH 1/2] bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks If no explicit macOS SDK was specified, setup.py should check for Tcl and TK frameworks in /Library/Frameworks; the previous commit inadvertently broke that test. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 0c9a4250168692..ae2fc7ae6d6b3b 100644 --- a/setup.py +++ b/setup.py @@ -177,10 +177,11 @@ def macosx_sdk_root(): m = re.search(r'-isysroot\s*(\S+)', cflags) if m is not None: MACOS_SDK_ROOT = m.group(1) + MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/' else: MACOS_SDK_ROOT = _osx_support._default_sysroot( sysconfig.get_config_var('CC')) - MACOS_SDK_SPECIFIED = MACOS_SDK_ROOT != '/' + MACOS_SDK_SPECIFIED = False return MACOS_SDK_ROOT @@ -1898,7 +1899,6 @@ def detect_tkinter_darwin(self): join('/', 'Library', 'Frameworks'), join(sysroot, 'System', 'Library', 'Frameworks'), ] - # Find the directory that contains the Tcl.framework and # Tk.framework bundles. for F in framework_dirs: From 183dacbe08b4bcefcd4367ebf57340f363aff969 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 4 Dec 2020 22:39:24 -0500 Subject: [PATCH 2/2] restore blank line --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index ae2fc7ae6d6b3b..90588e8b1d1fca 100644 --- a/setup.py +++ b/setup.py @@ -1899,6 +1899,7 @@ def detect_tkinter_darwin(self): join('/', 'Library', 'Frameworks'), join(sysroot, 'System', 'Library', 'Frameworks'), ] + # Find the directory that contains the Tcl.framework and # Tk.framework bundles. for F in framework_dirs: