From 1dc9157727146aaa148ce86e757bb3a40b3ff496 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Fri, 3 Jan 2025 22:42:01 +0100 Subject: [PATCH] always link system freetype2 using pkg-config --- pkg/fontconfig/build.zig | 2 +- pkg/harfbuzz/build.zig | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/fontconfig/build.zig b/pkg/fontconfig/build.zig index fb4dbfb36..a7a1ba9ef 100644 --- a/pkg/fontconfig/build.zig +++ b/pkg/fontconfig/build.zig @@ -186,7 +186,7 @@ pub fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*st _ = b.systemIntegrationOption("freetype", .{}); // So it shows up in help if (freetype_enabled) { if (b.systemIntegrationOption("freetype", .{})) { - lib.linkSystemLibrary2("freetype", dynamic_link_opts); + lib.linkSystemLibrary2("freetype2", dynamic_link_opts); } else { const freetype_dep = b.dependency( "freetype", diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index 983ec9ffc..a55dc7300 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -43,7 +43,11 @@ pub fn build(b: *std.Build) !void { { var it = module.import_table.iterator(); while (it.next()) |entry| test_exe.root_module.addImport(entry.key_ptr.*, entry.value_ptr.*); - test_exe.linkLibrary(freetype.artifact("freetype")); + if (b.systemIntegrationOption("freetype", .{})) { + test_exe.linkSystemLibrary2("freetype2", dynamic_link_opts); + } else { + test_exe.linkLibrary(freetype.artifact("freetype")); + } const tests_run = b.addRunArtifact(test_exe); const test_step = b.step("test", "Run tests"); test_step.dependOn(&tests_run.step);