From 1e95b898f4bd8803e33b1e2bcf9d2e41f75fb70c Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 4 Dec 2020 23:02:09 -0500 Subject: [PATCH 1/2] bpo-41116: Fix setup.py test for macOS Tcl/Tk frameworks (GH-23649) 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. (cherry picked from commit 29afab6c5f656f07ac85c9b2cf089631b2557a11) Co-authored-by: Ned Deily --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bfe621d0b50da1..bd5f73692441cb 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 From b5ff5e84520242f4eb26eef71f1ce1b8067aa57d Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 4 Dec 2020 23:09:37 -0500 Subject: [PATCH 2/2] add blurb for 3.9.1 final --- .../NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst diff --git a/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst b/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst new file mode 100644 index 00000000000000..2c8e5ea0297345 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2020-12-04-23-09-11.bpo-41116.mSbXyV.rst @@ -0,0 +1,3 @@ +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.