Skip to content

Commit 85714a1

Browse files
committed
Use old tcl/tk on Windows
1 parent fc87b2d commit 85714a1

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

cpython-windows/build.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"_lzma": ["xz"],
115115
"_sqlite3": ["sqlite"],
116116
"_ssl": ["openssl"],
117-
"_tkinter": ["tcl", "tk", "tix"],
117+
"_tkinter": ["tcl-8612", "tk-8612", "tix"],
118118
"_uuid": ["uuid"],
119119
"zlib": ["zlib"],
120120
}
@@ -355,7 +355,7 @@ def hack_props(
355355
sqlite_version = DOWNLOADS["sqlite"]["version"]
356356
xz_version = DOWNLOADS["xz"]["version"]
357357
zlib_version = DOWNLOADS["zlib"]["version"]
358-
tcltk_commit = DOWNLOADS["tk-windows-bin"]["git_commit"]
358+
tcltk_commit = DOWNLOADS["tk-windows-bin-8612"]["git_commit"]
359359
mpdecimal_version = DOWNLOADS["mpdecimal"]["version"]
360360

361361
sqlite_path = td / ("sqlite-autoconf-%s" % sqlite_version)
@@ -566,7 +566,7 @@ def hack_project_files(
566566
rb'<ClCompile Include="$(opensslIncludeDir)\openssl\applink.c">',
567567
)
568568

569-
# We're still on the pre-built tk-windows-bin 8.6.14 which doesn't have a
569+
# We're still on the pre-built tk-windows-bin 8.6.12 which doesn't have a
570570
# standalone zlib DLL. So remove references to it from 3.12+.
571571
if meets_python_minimum_version(python_version, "3.12"):
572572
static_replace_in_file(
@@ -1197,7 +1197,7 @@ def build_cpython(
11971197
bzip2_archive = download_entry("bzip2", BUILD)
11981198
sqlite_archive = download_entry("sqlite", BUILD)
11991199
tk_bin_archive = download_entry(
1200-
"tk-windows-bin", BUILD, local_name="tk-windows-bin.tar.gz"
1200+
"tk-windows-bin-8612", BUILD, local_name="tk-windows-bin.tar.gz"
12011201
)
12021202
xz_archive = download_entry("xz", BUILD)
12031203
zlib_archive = download_entry("zlib", BUILD)

src/validation.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ const PE_ALLOWED_LIBRARIES: &[&str] = &[
9999
"IPHLPAPI.DLL",
100100
"KERNEL32.dll",
101101
"msi.dll",
102-
"msvcrt.dll",
103102
"NETAPI32.dll",
104103
"ole32.dll",
105104
"OLEAUT32.dll",
@@ -239,7 +238,10 @@ static ELF_ALLOWED_LIBRARIES_BY_TRIPLE: Lazy<HashMap<&'static str, Vec<&'static
239238
),
240239
("mips64el-unknown-linux-gnuabi64", vec![]),
241240
("ppc64le-unknown-linux-gnu", vec!["ld64.so.1", "ld64.so.2"]),
242-
("riscv64-unknown-linux-gnu", vec!["ld-linux-riscv64-lp64d.so.1", "libatomic.so.1"]),
241+
(
242+
"riscv64-unknown-linux-gnu",
243+
vec!["ld-linux-riscv64-lp64d.so.1", "libatomic.so.1"],
244+
),
243245
("s390x-unknown-linux-gnu", vec!["ld64.so.1"]),
244246
("x86_64-unknown-linux-gnu", vec!["ld-linux-x86-64.so.2"]),
245247
("x86_64_v2-unknown-linux-gnu", vec!["ld-linux-x86-64.so.2"]),

0 commit comments

Comments
 (0)