Skip to content

Commit 2d24cdb

Browse files
authored
Pin Tcl/Tk to 8.x until compatibility with Tcl/Tk 9 is achieved (#587)
1 parent fb755cf commit 2d24cdb

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

master/custom/factories.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ class MacOSArmWithBrewBuild(UnixBuild):
517517
"--with-openssl=/opt/homebrew/opt/openssl@3",
518518
"CPPFLAGS=-I/opt/homebrew/include",
519519
"LDFLAGS=-L/opt/homebrew/lib",
520+
"PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig",
520521
]
521522
# These tests are known to crash on M1 macs (see bpo-45289).
522523
testFlags = [*UnixBuild.testFlags,
@@ -530,6 +531,7 @@ class MacOSArmWithBrewNoGilBuild(UnixNoGilBuild):
530531
"--with-openssl=/opt/homebrew/opt/openssl@3",
531532
"CPPFLAGS=-I/opt/homebrew/include",
532533
"LDFLAGS=-L/opt/homebrew/lib",
534+
"PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig",
533535
]
534536

535537

@@ -540,6 +542,7 @@ class MacOSArmWithBrewRefleakBuild(UnixRefleakBuild):
540542
"--with-openssl=/opt/homebrew/opt/openssl@3",
541543
"CPPFLAGS=-I/opt/homebrew/include",
542544
"LDFLAGS=-L/opt/homebrew/lib",
545+
"PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig",
543546
]
544547

545548

@@ -550,6 +553,7 @@ class MacOSArmWithBrewNoGilRefleakBuild(UnixNoGilRefleakBuild):
550553
"--with-openssl=/opt/homebrew/opt/openssl@3",
551554
"CPPFLAGS=-I/opt/homebrew/include",
552555
"LDFLAGS=-L/opt/homebrew/lib",
556+
"PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig",
553557
]
554558

555559

@@ -559,6 +563,7 @@ class MacOSAsanNoGilBuild(UnixAsanNoGilBuild):
559563
"--with-openssl=/opt/homebrew/opt/openssl@3",
560564
"CPPFLAGS=-I/opt/homebrew/include",
561565
"LDFLAGS=-L/opt/homebrew/lib",
566+
"PKG_CONFIG_PATH=/opt/homebrew/opt/tcl-tk@8/lib/pkgconfig",
562567
]
563568
asan_options = 'detect_leaks=0:allocator_may_return_null=1:handle_segv=0'
564569
compile_environ = {'ASAN_OPTIONS': asan_options}

0 commit comments

Comments
 (0)