Maarrk/lua
1
0
Fork 0
mirror of https://github.com/allyourcodebase/lua.git synced 2026-05-01 19:27:57 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Merge d6254e1434 into 5a5a4135cb

Browse source
This commit is contained in:
Carmen 2025-09-24 11:23:40 +00:00 • committed by GitHub
commit a4a0cde26c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 40 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

112
build.zig
View file

@ -6,7 +6,7 @@ const OptimizeMode = std.builtin.OptimizeMode;
const version = std.SemanticVersion{ const version = std.SemanticVersion{
.major = 5, .major = 5,
.minor = 4, .minor = 4,
.patch = 7, .patch = 8,
}; };
const lib_name = "lua"; const lib_name = "lua";
const exe_name = lib_name ++ "_exe"; const exe_name = lib_name ++ "_exe";
@ -25,26 +25,44 @@ pub fn build(b: *Build) !void {
const lua_src = b.dependency("lua", .{}); const lua_src = b.dependency("lua", .{});
const lib = const lib = b.addLibrary(.{
b.addStaticLibrary(artifactOptions( .name = lib_name,
.{ .shared = false }, .linkage = .static,
.{ .target = target, .optimize = optimize }, .root_module = b.createModule(.{
)); .link_libc = true,
.optimize = optimize,
.target = target,
}),
});
const shared = if (build_shared) const shared = if (build_shared)
b.addSharedLibrary(artifactOptions( b.addLibrary(.{
.{ .shared = true }, .name = lib_name ++ "54",
.{ .target = target, .optimize = optimize }, .linkage = .dynamic,
)) .root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
.target = target,
.strip = if (target.result.os.tag == .windows) true else null,
}),
})
else else
null; null;
const exe = b.addExecutable(artifactOptions(.exe, .{ const exe = b.addExecutable(.{
.target = target, .name = exe_name,
.optimize = optimize, .root_module = b.createModule(.{
})); .link_libc = true,
const exec = b.addExecutable(artifactOptions(.exec, .{ .optimize = optimize,
.target = target, .target = target,
.optimize = optimize, }),
})); });
const exec = b.addExecutable(.{
.name = compiler_name,
.root_module = b.createModule(.{
.link_libc = true,
.optimize = optimize,
.target = target,
}),
});
if (!target.result.isMinGW()) { if (!target.result.isMinGW()) {
lib.linkSystemLibrary("m"); lib.linkSystemLibrary("m");
exe.linkSystemLibrary("m"); exe.linkSystemLibrary("m");
@ -170,64 +188,6 @@ pub fn build(b: *Build) !void {
}); });
unpack_step.dependOn(&unpack_cmd.step); unpack_step.dependOn(&unpack_cmd.step);
} }
const ArtifactTarget = union(enum) {
// True if shared options
shared: bool,
exe,
exec,
};
const ArtifactTargetOptions = struct {
target: ResolvedTarget,
optimize: OptimizeMode,
};
fn artifactOptions(comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) {
.exe, .exec => Build.ExecutableOptions,
.shared => |shared| if (shared)
Build.SharedLibraryOptions
else
Build.StaticLibraryOptions,
} {
const t = opts.target.result.os.tag;
return switch (options) {
.shared => |shared| if (shared) blk: {
switch (t) {
.windows => break :blk .{
.name = lib_name ++ "54",
.target = opts.target,
.optimize = opts.optimize,
.strip = true,
},
else => break :blk .{
.name = lib_name,
.target = opts.target,
.optimize = opts.optimize,
},
}
} else blk: {
switch (t) {
else => break :blk .{
.name = lib_name,
.target = opts.target,
.optimize = opts.optimize,
},
}
},
.exe => switch (t) {
else => .{
.name = exe_name,
.target = opts.target,
.optimize = opts.optimize,
},
},
.exec => switch (t) {
else => .{
.name = compiler_name,
.target = opts.target,
.optimize = opts.optimize,
},
},
};
}
const cflags = [_][]const u8{ const cflags = [_][]const u8{
"-std=gnu99", "-std=gnu99",

8
build.zig.zon
View file

@ -1,14 +1,14 @@
.{ .{
.name = .lua, .name = .lua,
.version = "5.4.7", .version = "5.4.8",
.fingerprint = 0xd671372bcadcaace, .fingerprint = 0xd671372bcadcaace,
.minimum_zig_version = "0.14.0", .minimum_zig_version = "0.15.0",
.dependencies = .{ .dependencies = .{
.lua = .{ .lua = .{
.url = "https://www.lua.org/ftp/lua-5.4.7.tar.gz", .url = "https://www.lua.org/ftp/lua-5.4.8.tar.gz",
.hash = "N-V-__8AAIMvFABt-Qcpk24RD10ldEN743D8Q2e19Er8x3dJ", .hash = "N-V-__8AAKEzFAAA695b9LXBhUSVK5MAV_VKSm1mEj3Acbze",
}, },
}, },