646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
--- a/lib_pypy/_tkinter/tklib_build.py
|
|
+++ b/lib_pypy/_tkinter/tklib_build.py
|
|
@@ -17,23 +17,14 @@ elif sys.platform == 'win32':
|
|
incdirs = []
|
|
linklibs = ['tcl85', 'tk85']
|
|
libdirs = []
|
|
-elif sys.platform == 'darwin':
|
|
- # homebrew
|
|
- homebrew = os.environ.get('HOMEBREW_PREFIX', '')
|
|
- incdirs = ['/usr/local/opt/tcl-tk/include']
|
|
- linklibs = ['tcl8.6', 'tk8.6']
|
|
- libdirs = []
|
|
- if homebrew:
|
|
- incdirs.append(homebrew + '/include')
|
|
- libdirs.append(homebrew + '/opt/tcl-tk/lib')
|
|
else:
|
|
# On some Linux distributions, the tcl and tk libraries are
|
|
# stored in /usr/include, so we must check this case also
|
|
- libdirs = []
|
|
+ libdirs = ["@tcl@/lib", "@tk@/lib"]
|
|
found = False
|
|
for _ver in ['', '8.6', '8.5']:
|
|
- incdirs = ['/usr/include/tcl' + _ver]
|
|
- linklibs = ['tcl' + _ver, 'tk' + _ver]
|
|
+ incdirs = ['@tcl_dev@/include', '@tk_dev@/include']
|
|
+ linklibs = ['@tcl_libprefix@', '@tk_libprefix@']
|
|
if os.path.isdir(incdirs[0]):
|
|
found = True
|
|
break
|