zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

freetype: disable harfbuzz for now (build is broken, clang warning cannot be disabled)

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-04-25 11:30:59 -07:00 • committed by Stephen Gutekanst
parent 3a561ec1c7
commit 142c8b5b2e
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libs/freetype/build.zig
View file

@ -96,29 +96,32 @@ pub fn testStep(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.C
.freetype = .{ .freetype = .{
.brotli = true, .brotli = true,
}, },
.harfbuzz = .{}, // TODO: harfbuzz is broken
// .harfbuzz = .{},
}); });
main_tests.main_pkg_path = sdkPath("/"); main_tests.main_pkg_path = sdkPath("/");
b.installArtifact(main_tests); b.installArtifact(main_tests);
const harfbuzz_tests = b.addTest(.{ // TODO: harfbuzz is broken
.name = "harfbuzz-tests", // const harfbuzz_tests = b.addTest(.{
.root_source_file = .{ .path = sdkPath("/src/harfbuzz/main.zig") }, // .name = "harfbuzz-tests",
.target = target, // .root_source_file = .{ .path = sdkPath("/src/harfbuzz/main.zig") },
.optimize = optimize, // .target = target,
}); // .optimize = optimize,
harfbuzz_tests.addModule("freetype", module(b)); // });
link(b, harfbuzz_tests, .{ // harfbuzz_tests.addModule("freetype", module(b));
.freetype = .{ // link(b, harfbuzz_tests, .{
.brotli = true, // .freetype = .{
}, // .brotli = true,
.harfbuzz = .{}, // },
}); // .harfbuzz = .{},
harfbuzz_tests.main_pkg_path = sdkPath("/"); // });
b.installArtifact(harfbuzz_tests); // harfbuzz_tests.main_pkg_path = sdkPath("/");
// b.installArtifact(harfbuzz_tests);
const main_tests_run = b.addRunArtifact(main_tests); const main_tests_run = b.addRunArtifact(main_tests);
main_tests_run.step.dependOn(&b.addRunArtifact(harfbuzz_tests).step); // TODO: harfbuzz is broken
// main_tests_run.step.dependOn(&b.addRunArtifact(harfbuzz_tests).step);
return main_tests_run; return main_tests_run;
} }
@ -194,10 +197,11 @@ pub fn buildFreetype(b: *Build, optimize: std.builtin.OptimizeMode, target: std.
pub fn buildHarfbuzz(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, options: HarfbuzzOptions) *std.build.CompileStep { pub fn buildHarfbuzz(b: *Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, options: HarfbuzzOptions) *std.build.CompileStep {
const lib = b.addStaticLibrary(.{ const lib = b.addStaticLibrary(.{
.name = "harfbuzz", .name = "harfbuzz",
.root_source_file = .{ .path = hb_root ++ "/src/harfbuzz.cc" },
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
}); });
// TODO: `-Wno-error` is not respected for some reason; as a result harfbuzz builds are broken.
lib.addCSourceFile(hb_root ++ "/src/harfbuzz.cc", &.{"-Wno-error=cast-function-type-strict"});
lib.linkLibCpp(); lib.linkLibCpp();
lib.addIncludePath(hb_include_path); lib.addIncludePath(hb_include_path);
lib.addIncludePath(ft_include_path); lib.addIncludePath(ft_include_path);