From acc2ea724f26eb5e7b6ab5975ab5609ef422142c Mon Sep 17 00:00:00 2001 From: Jayson Reis Date: Tue, 22 Jul 2025 23:47:18 +0200 Subject: [PATCH] build-system: Replace deprecated usages of addStaticLibrary with addLibrary (#8029) Hi there, this is just a low-hanging fruit and it also prepares the way for the future 0.15, which removes addStaticLibrary. Please, let me know what to do on the `// TODO` comments. --- pkg/breakpad/build.zig | 9 ++++++--- pkg/cimgui/build.zig | 9 ++++++--- pkg/fontconfig/build.zig | 9 ++++++--- pkg/freetype/build.zig | 9 ++++++--- pkg/glslang/build.zig | 9 ++++++--- pkg/harfbuzz/build.zig | 9 ++++++--- pkg/highway/build.zig | 9 ++++++--- pkg/libintl/build.zig | 9 ++++++--- pkg/libpng/build.zig | 9 ++++++--- pkg/libxml2/build.zig | 9 ++++++--- pkg/macos/build.zig | 9 ++++++--- pkg/oniguruma/build.zig | 9 ++++++--- pkg/sentry/build.zig | 9 ++++++--- pkg/simdutf/build.zig | 9 ++++++--- pkg/spirv-cross/build.zig | 9 ++++++--- pkg/utf8proc/build.zig | 9 ++++++--- pkg/utfcpp/build.zig | 9 ++++++--- pkg/zlib/build.zig | 9 ++++++--- src/build/GhosttyLib.zig | 3 ++- 19 files changed, 110 insertions(+), 55 deletions(-) diff --git a/pkg/breakpad/build.zig b/pkg/breakpad/build.zig index 42247b12c..9ab6b89cd 100644 --- a/pkg/breakpad/build.zig +++ b/pkg/breakpad/build.zig @@ -4,10 +4,13 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "breakpad", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibCpp(); lib.addIncludePath(b.path("vendor")); diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig index 3ca735383..60bab2c70 100644 --- a/pkg/cimgui/build.zig +++ b/pkg/cimgui/build.zig @@ -12,10 +12,13 @@ pub fn build(b: *std.Build) !void { }); const imgui = b.dependency("imgui", .{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "cimgui", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); lib.linkLibCpp(); diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig index 9e4173da8..c4f99c1e9 100644 --- a/pkg/fontconfig/build.zig +++ b/pkg/fontconfig/build.zig @@ -64,10 +64,13 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu const libxml2_iconv_enabled = options.libxml2_iconv_enabled; const freetype_enabled = options.freetype_enabled; - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "fontconfig", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); if (target.result.os.tag != .windows) { diff --git a/pkg/freetype/build.zig b/pkg/freetype/build.zig index e9f72210a..b13ba1fa8 100644 --- a/pkg/freetype/build.zig +++ b/pkg/freetype/build.zig @@ -61,10 +61,13 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu const libpng_enabled = options.libpng_enabled; - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "freetype", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); if (target.result.os.tag.isDarwin()) { diff --git a/pkg/glslang/build.zig b/pkg/glslang/build.zig index 747216a39..9a8e72815 100644 --- a/pkg/glslang/build.zig +++ b/pkg/glslang/build.zig @@ -40,10 +40,13 @@ fn buildGlslang( target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, ) !*std.Build.Step.Compile { - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "glslang", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); lib.linkLibCpp(); diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index 424f2afed..861f2802d 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -92,10 +92,13 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu .@"enable-libpng" = true, }); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "harfbuzz", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); lib.linkLibCpp(); diff --git a/pkg/highway/build.zig b/pkg/highway/build.zig index 5036316da..29919615c 100644 --- a/pkg/highway/build.zig +++ b/pkg/highway/build.zig @@ -12,10 +12,13 @@ pub fn build(b: *std.Build) !void { .optimize = optimize, }); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "highway", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibCpp(); lib.addIncludePath(upstream.path("")); diff --git a/pkg/libintl/build.zig b/pkg/libintl/build.zig index 1baed195a..0e32648e7 100644 --- a/pkg/libintl/build.zig +++ b/pkg/libintl/build.zig @@ -30,10 +30,13 @@ pub fn build(b: *std.Build) !void { }); { - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "intl", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); lib.addIncludePath(b.path("")); diff --git a/pkg/libpng/build.zig b/pkg/libpng/build.zig index 8729398f8..11ed29b18 100644 --- a/pkg/libpng/build.zig +++ b/pkg/libpng/build.zig @@ -4,10 +4,13 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "png", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); if (target.result.os.tag == .linux) { diff --git a/pkg/libxml2/build.zig b/pkg/libxml2/build.zig index 7effdd134..7c3c2b607 100644 --- a/pkg/libxml2/build.zig +++ b/pkg/libxml2/build.zig @@ -6,10 +6,13 @@ pub fn build(b: *std.Build) !void { const upstream = b.dependency("libxml2", .{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "xml2", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); diff --git a/pkg/macos/build.zig b/pkg/macos/build.zig index ddbeb82c9..4188ab9e5 100644 --- a/pkg/macos/build.zig +++ b/pkg/macos/build.zig @@ -12,10 +12,13 @@ pub fn build(b: *std.Build) !void { .optimize = optimize, }); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "macos", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.addCSourceFile(.{ diff --git a/pkg/oniguruma/build.zig b/pkg/oniguruma/build.zig index c23d744df..d9287b4fa 100644 --- a/pkg/oniguruma/build.zig +++ b/pkg/oniguruma/build.zig @@ -57,10 +57,13 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu const target = options.target; const optimize = options.optimize; - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "oniguruma", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); const t = target.result; lib.linkLibC(); diff --git a/pkg/sentry/build.zig b/pkg/sentry/build.zig index 0e6993ad4..95900ae8f 100644 --- a/pkg/sentry/build.zig +++ b/pkg/sentry/build.zig @@ -12,10 +12,13 @@ pub fn build(b: *std.Build) !void { .optimize = optimize, }); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "sentry", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); if (target.result.os.tag.isDarwin()) { diff --git a/pkg/simdutf/build.zig b/pkg/simdutf/build.zig index 30de40fea..f96eeae45 100644 --- a/pkg/simdutf/build.zig +++ b/pkg/simdutf/build.zig @@ -4,10 +4,13 @@ pub fn build(b: *std.Build) !void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "simdutf", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibCpp(); lib.addIncludePath(b.path("vendor")); diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig index ff67e3e72..8ac612f08 100644 --- a/pkg/spirv-cross/build.zig +++ b/pkg/spirv-cross/build.zig @@ -35,10 +35,13 @@ fn buildSpirvCross( target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, ) !*std.Build.Step.Compile { - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "spirv_cross", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); lib.linkLibCpp(); diff --git a/pkg/utf8proc/build.zig b/pkg/utf8proc/build.zig index 1ee04ef9b..75fb8972c 100644 --- a/pkg/utf8proc/build.zig +++ b/pkg/utf8proc/build.zig @@ -7,10 +7,13 @@ pub fn build(b: *std.Build) !void { const module = b.addModule("utf8proc", .{ .root_source_file = .{ .path = "main.zig" } }); const upstream = b.dependency("utf8proc", .{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "utf8proc", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); diff --git a/pkg/utfcpp/build.zig b/pkg/utfcpp/build.zig index 8e1a3cb20..341b35578 100644 --- a/pkg/utfcpp/build.zig +++ b/pkg/utfcpp/build.zig @@ -4,10 +4,13 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "utfcpp", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibCpp(); diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig index 28344c989..caa557454 100644 --- a/pkg/zlib/build.zig +++ b/pkg/zlib/build.zig @@ -4,10 +4,13 @@ pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "z", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); lib.linkLibC(); if (target.result.os.tag.isDarwin()) { diff --git a/src/build/GhosttyLib.zig b/src/build/GhosttyLib.zig index 857fd1798..b244a72c5 100644 --- a/src/build/GhosttyLib.zig +++ b/src/build/GhosttyLib.zig @@ -18,7 +18,7 @@ pub fn initStatic( b: *std.Build, deps: *const SharedDeps, ) !GhosttyLib { - const lib = b.addStaticLibrary(.{ + const lib = b.addLibrary(.{ .name = "ghostty", .root_module = b.createModule(.{ .root_source_file = b.path("src/main_c.zig"), @@ -28,6 +28,7 @@ pub fn initStatic( .omit_frame_pointer = deps.config.strip, .unwind_tables = if (deps.config.strip) .none else .sync, }), + .linkage = .static, }); lib.linkLibC();