From 39e7723be61420e31eb83b427f0abee9c2dd5412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Langa?= Date: Tue, 8 Apr 2025 13:24:24 +0200 Subject: [PATCH] Pin Tcl/Tk to 8.x until compatibility with Tcl/Tk 9 is achieved --- master/custom/factories.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/master/custom/factories.py b/master/custom/factories.py index 37493ce2..1f95f0cd 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -517,6 +517,7 @@ class MacOSArmWithBrewBuild(UnixBuild): "--with-openssl=/opt/homebrew/opt/openssl@3", "CPPFLAGS=-I/opt/homebrew/include", "LDFLAGS=-L/opt/homebrew/lib", + "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", ] # These tests are known to crash on M1 macs (see bpo-45289). testFlags = [*UnixBuild.testFlags, @@ -530,6 +531,7 @@ class MacOSArmWithBrewNoGilBuild(UnixNoGilBuild): "--with-openssl=/opt/homebrew/opt/openssl@3", "CPPFLAGS=-I/opt/homebrew/include", "LDFLAGS=-L/opt/homebrew/lib", + "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", ] @@ -540,6 +542,7 @@ class MacOSArmWithBrewRefleakBuild(UnixRefleakBuild): "--with-openssl=/opt/homebrew/opt/openssl@3", "CPPFLAGS=-I/opt/homebrew/include", "LDFLAGS=-L/opt/homebrew/lib", + "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", ] @@ -550,6 +553,7 @@ class MacOSArmWithBrewNoGilRefleakBuild(UnixNoGilRefleakBuild): "--with-openssl=/opt/homebrew/opt/openssl@3", "CPPFLAGS=-I/opt/homebrew/include", "LDFLAGS=-L/opt/homebrew/lib", + "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", ] @@ -559,6 +563,7 @@ class MacOSAsanNoGilBuild(UnixAsanNoGilBuild): "--with-openssl=/opt/homebrew/opt/openssl@3", "CPPFLAGS=-I/opt/homebrew/include", "LDFLAGS=-L/opt/homebrew/lib", + "PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig", ] asan_options = 'detect_leaks=0:allocator_may_return_null=1:handle_segv=0' compile_environ = {'ASAN_OPTIONS': asan_options}