Skip to content

Commit 32b5ece

Browse files
marler8997marler8997
committed
upgrade 3.11.4 to 3.11.13
1 parent 6ae2e80 commit 32b5ece

File tree

2 files changed

+28
-30
lines changed

2 files changed

+28
-30
lines changed

‎build.zig‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Version = enum {
2-
@"3.11.4",
2+
@"3.11.13",
33
@"3.12.11",
44
pub fn libName(self: Version) []const u8 {
55
return switch (self) {
6-
.@"3.11.4" => "3.11",
6+
.@"3.11.13" => "3.11",
77
.@"3.12.11" => "3.12",
88
};
99
}
@@ -59,7 +59,7 @@ pub fn build(b: *std.Build) !void {
5959
});
6060

6161
const upstream: *std.Build.Dependency = switch (version) {
62-
.@"3.11.4" => if (b.lazyDependency("upstream_3.11.4", .{})) |d| d else noUpstream(b),
62+
.@"3.11.13" => if (b.lazyDependency("upstream_3.11.13", .{})) |d| d else noUpstream(b),
6363
.@"3.12.11" => if (b.lazyDependency("upstream_3.12.11", .{})) |d| d else noUpstream(b),
6464
};
6565

@@ -155,7 +155,7 @@ pub fn build(b: *std.Build) !void {
155155
const run = std.Build.Step.Run.create(b, "run deepfreeze.py");
156156
run.addFileArg(bootstrap_packaged.exe);
157157
run.addFileArg(upstream.path(switch (version) {
158-
.@"3.11.4" => "Tools/scripts/deepfreeze.py",
158+
.@"3.11.13" => "Tools/scripts/deepfreeze.py",
159159
else => "Tools/build/deepfreeze.py",
160160
}));
161161
run.addArg("-o");
@@ -336,7 +336,7 @@ fn addMakesetup(
336336
.xxlimited_35 = false,
337337
._xxsubinterpreters = false,
338338
};
339-
const @"stdlib_modules_3.11.4" = .{
339+
const @"stdlib_modules_3.11.13" = .{
340340
._typing = true,
341341
._sha256 = true,
342342
._sha512 = true,
@@ -366,7 +366,7 @@ fn addMakesetup(
366366
replace.addArg("MODULE_BUILDTYPE=static");
367367
addReplaceModuleArgs(b, replace, @TypeOf(stdlib_modules_common), stdlib_modules_common);
368368
switch (version) {
369-
.@"3.11.4" => addReplaceModuleArgs(b, replace, @TypeOf(@"stdlib_modules_3.11.4"), @"stdlib_modules_3.11.4"),
369+
.@"3.11.13" => addReplaceModuleArgs(b, replace, @TypeOf(@"stdlib_modules_3.11.13"), @"stdlib_modules_3.11.13"),
370370
.@"3.12.11" => {
371371
replace.addArg("MODULE__CTYPES_MALLOC_CLOSURE=");
372372
addReplaceModuleArgs(b, replace, @TypeOf(@"stdlib_modules_3.12.11"), @"stdlib_modules_3.12.11");
@@ -436,7 +436,7 @@ fn addPythonExe(
436436
});
437437

438438
switch (args.pyconfig.version) {
439-
.@"3.11.4" => {
439+
.@"3.11.13" => {
440440
// workaround dictobject.c memcpy alignment issue
441441
exe.root_module.sanitize_c = false;
442442
},
@@ -449,7 +449,7 @@ fn addPythonExe(
449449
.Debug => {},
450450
.ReleaseSafe, .ReleaseSmall, .ReleaseFast => {
451451
const release_date = switch (args.pyconfig.version) {
452-
.@"3.11.4" => "June 6, 2023",
452+
.@"3.11.13" => "June 3, 2025",
453453
.@"3.12.11" => "June 3, 2025",
454454
};
455455
// need to redefine __DATE__ and __TIME__ for a reproducible build
@@ -480,7 +480,7 @@ fn addPythonExe(
480480
switch (args.stage) {
481481
.freeze_module, .bootstrap => {},
482482
.final => |final| switch (args.pyconfig.version) {
483-
.@"3.11.4" => {},
483+
.@"3.11.13" => {},
484484
else => for (final.frozen_headers) |h| {
485485
exe.addIncludePath(h.dirname().dirname());
486486
},
@@ -566,7 +566,7 @@ fn addPythonExe(
566566
"Modules/getpath_noop.c",
567567
},
568568
switch (args.pyconfig.version) {
569-
.@"3.11.4" => &library_src_omit_frozen.@"3.11.4",
569+
.@"3.11.13" => &library_src_omit_frozen.@"3.11.13",
570570
.@"3.12.11" => &library_src_omit_frozen.@"3.12.11",
571571
},
572572
}),
@@ -576,7 +576,7 @@ fn addPythonExe(
576576
"Modules/getbuildinfo.c",
577577
},
578578
switch (args.pyconfig.version) {
579-
.@"3.11.4" => &library_src_omit_frozen.@"3.11.4",
579+
.@"3.11.13" => &library_src_omit_frozen.@"3.11.13",
580580
.@"3.12.11" => &library_src_omit_frozen.@"3.12.11",
581581
},
582582
}),
@@ -587,7 +587,7 @@ fn addPythonExe(
587587
"Python/frozen.c",
588588
},
589589
switch (args.pyconfig.version) {
590-
.@"3.11.4" => &library_src_omit_frozen.@"3.11.4",
590+
.@"3.11.13" => &library_src_omit_frozen.@"3.11.13",
591591
.@"3.12.11" => &library_src_omit_frozen.@"3.12.11",
592592
},
593593
}),
@@ -689,6 +689,7 @@ const header_config_set = struct {
689689
.{ .HAVE_LANGINFO_H, "langinfo.h" },
690690
.{ .HAVE_LIBINTL_H, "libintl.h" },
691691
.{ .HAVE_LIBUTIL_H, "libutil.h" },
692+
.{ .HAVE_LINUX_LIMITS_H, "linux/limits.h" },
692693
.{ .HAVE_NETDB_H, "netdb.h" },
693694
.{ .HAVE_NETINET_IN_H, "netinet/in.h" },
694695
.{ .HAVE_NETPACKET_PACKET_H, "netpacket/packet.h" },
@@ -767,13 +768,12 @@ const header_config_set = struct {
767768
.{ .HAVE_UUID_UUID_H, "uuid/uuid.h" },
768769
.{ .HAVE_ZLIB_H, "zlib.h" },
769770
};
770-
pub const @"3.11.4" = concatConfigs(common, .{
771+
pub const @"3.11.13" = concatConfigs(common, .{
771772
.{ .HAVE_MEMORY_H, "memory.h" },
772773
});
773774
pub const @"3.12.11" = concatConfigs(common, .{
774775
.{ .HAVE_EDITLINE_READLINE_H, "editline/readline.h" },
775776
.{ .HAVE_LINUX_FS_H, "linux/fs.h" },
776-
.{ .HAVE_LINUX_LIMITS_H, "linux/limits.h" },
777777
.{ .HAVE_MINIX_CONFIG_H, "minix/config.h" },
778778
.{ .HAVE_NET_ETHERNET_H, "net/ethernet.h" },
779779
.{ .HAVE_PANEL_H, "panel.h" },
@@ -1202,7 +1202,7 @@ const exe_config_set = struct {
12021202
.{ .HAVE_WORKING_TZSET, "#include <time.h>\nint main(){tzset(); return 0;}" },
12031203
.{ .HAVE_ZLIB_COPY, "#include <zlib.h>\nint main(){z_stream strm; inflateCopy(&strm, &strm); return 0;}" },
12041204
};
1205-
pub const @"3.11.4" = concatConfigs(common, .{
1205+
pub const @"3.11.13" = concatConfigs(common, .{
12061206
.{ .HAVE_TTYNAME, "#include <unistd.h>\nint main(){ttyname(0);}" },
12071207
.{ .HAVE_LIBGDBM_COMPAT, "#include <gdbm.h>\nint main(){GDBM_FILE gf; return 0;}" },
12081208
.{ .HAVE_LIBNDBM, "#include <ndbm.h>\nint main(){DBM *db; return 0;}" },
@@ -1314,6 +1314,7 @@ fn addPyconfig(
13141314
.Py_ENABLE_SHARED = null,
13151315
.Py_HASH_ALGORITHM = null,
13161316
.Py_STATS = null,
1317+
.Py_SUNOS_VERSION = null,
13171318
.Py_TRACE_REFS = null,
13181319
.SETPGRP_HAVE_ARG = null,
13191320
.SIGNED_RIGHT_SHIFT_ZERO_FILLS = null,
@@ -1364,9 +1365,11 @@ fn addPyconfig(
13641365
.HAVE_USABLE_WCHAR_T = null,
13651366
.HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION = null,
13661367
.HAVE_CHROOT = have(t.os.tag == .linux),
1368+
// Readline type (static configuration, not function test)
1369+
.HAVE_RL_COMPDISP_FUNC_T = null,
13671370
});
13681371
switch (version) {
1369-
.@"3.11.4" => config_header.addValues(.{
1372+
.@"3.11.13" => config_header.addValues(.{
13701373
.PY_FORMAT_SIZE_T = "z",
13711374
.TIME_WITH_SYS_TIME = 1,
13721375
.FLOAT_WORDS_BIGENDIAN = null,
@@ -1381,14 +1384,9 @@ fn addPyconfig(
13811384
// ncurses library (static configuration, not function test)
13821385
.HAVE_NCURSESW = null,
13831386

1384-
// Readline type (static configuration, not function test)
1385-
.HAVE_RL_COMPDISP_FUNC_T = null,
1386-
13871387
// Performance trampoline feature
13881388
.PY_HAVE_PERF_TRAMPOLINE = null,
13891389

1390-
// Platform-specific version defines
1391-
.Py_SUNOS_VERSION = null,
13921390
._HPUX_ALT_XOPEN_SOCKET_API = null,
13931391
._OPENBSD_SOURCE = null,
13941392

@@ -1404,11 +1402,11 @@ fn addPyconfig(
14041402
}
14051403

14061404
const header_configs: []const Config = switch (version) {
1407-
.@"3.11.4" => &header_config_set.@"3.11.4",
1405+
.@"3.11.13" => &header_config_set.@"3.11.13",
14081406
.@"3.12.11" => &header_config_set.@"3.12.11",
14091407
};
14101408
const exe_configs: []const Config = switch (version) {
1411-
.@"3.11.4" => &exe_config_set.@"3.11.4",
1409+
.@"3.11.13" => &exe_config_set.@"3.11.13",
14121410
.@"3.12.11" => &exe_config_set.@"3.12.11",
14131411
};
14141412

@@ -1548,7 +1546,7 @@ const python_src = struct {
15481546
"Python/fileutils.c",
15491547
"Python/suggestions.c",
15501548
};
1551-
pub const @"3.11.4" = common;
1549+
pub const @"3.11.13" = common;
15521550
pub const @"3.12.11" = common ++ .{
15531551
"Python/assemble.c",
15541552
"Python/flowgraph.c",
@@ -1607,7 +1605,7 @@ const object_src = struct {
16071605
"Objects/unionobject.c",
16081606
"Objects/weakrefobject.c",
16091607
};
1610-
pub const @"3.11.4" = common ++ .{
1608+
pub const @"3.11.13" = common ++ .{
16111609
"Objects/accu.c",
16121610
};
16131611
pub const @"3.12.11" = common ++ .{
@@ -1638,7 +1636,7 @@ const module_src = [_][]const u8{
16381636
};
16391637

16401638
const library_src_omit_frozen = struct {
1641-
pub const @"3.11.4" = parser_src ++ object_src.@"3.11.4" ++ python_src.@"3.11.4" ++ module_src;
1639+
pub const @"3.11.13" = parser_src ++ object_src.@"3.11.13" ++ python_src.@"3.11.13" ++ module_src;
16421640
pub const @"3.12.11" = parser_src ++ object_src.@"3.12.11" ++ python_src.@"3.12.11" ++ module_src;
16431641
};
16441642

@@ -1670,7 +1668,7 @@ const frozen_modules = [_][]const u8{
16701668

16711669
fn frozenModuleNames(version: Version) *const [frozen_modules.len][]const u8 {
16721670
return switch (version) {
1673-
.@"3.11.4" => &frozen_module_name_sets.@"3.11",
1671+
.@"3.11.13" => &frozen_module_name_sets.@"3.11",
16741672
else => &frozen_module_name_sets.@"after_3.11",
16751673
};
16761674
}

‎build.zig.zon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
.version = "0.0.0",
55
.minimum_zig_version = "0.14.1",
66
.dependencies = .{
7-
.@"upstream_3.11.4" = .{
8-
.url = "git+https://github.com/python/cpython#d2340ef25721b6a72d45d4508c672c4be38c67d3",
9-
.hash = "N-V-__8AABDkxQWDw9b21RiSHxBb2ErJ78saCf1XL88YMoT7",
7+
.@"upstream_3.11.13" = .{
8+
.url = "git+https://github.com/python/cpython#498b971ea3673012a1d4b21860b229d55fc6e575",
9+
.hash = "N-V-__8AACr32QWySXRzLeDQuZNoyM6FlWz3U4smc4qJ0EXe",
1010
.lazy = true,
1111
},
1212
.@"upstream_3.12.11" = .{

0 commit comments

Comments
 (0)