From 68487beebc985acbd62b8f146752e6c4627493b6 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 20 Oct 2025 12:49:32 +0200 Subject: [PATCH 1/6] Update to support zig 0.15.2 --- build.zig | 20 +++++++++++--------- build.zig.zon | 16 ++++++++-------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.zig b/build.zig index 4acf920..7a6cf2d 100644 --- a/build.zig +++ b/build.zig @@ -146,10 +146,7 @@ pub fn build(b: *std.Build) !void { const upstream_root = patch_step.getDirectory(); // Grab the sources.json which tells us what to build - const sources_json = b.path("sources.json"); - const sources_path = sources_json.getPath(b); - - const sources_file = try build_root.openFile(sources_path, .{}); + const sources_file = try build_root.openFile("sources.json", .{}); const source_content = try sources_file.readToEndAlloc(b.allocator, 1024 * 1024 * 1024); // Parse it @@ -248,16 +245,21 @@ pub fn build(b: *std.Build) !void { .exe => { const mod = b.addExecutable(.{ .name = module.name, - .optimize = optimize, - .target = target, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), }); break :blk mod; }, .lib => { - const mod = b.addStaticLibrary(.{ + const mod = b.addLibrary(.{ .name = module.name, - .optimize = optimize, - .target = target, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + }), + .linkage = .static, }); break :blk mod; }, diff --git a/build.zig.zon b/build.zig.zon index c378750..4ec061d 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -3,22 +3,22 @@ .version = "0.20250514.0", .fingerprint = 0x5f0947d235641b12, .dependencies = .{ - .googletest = .{ - .url = "https://github.com/lukaskastern/googletest/archive/b026ea2f0e2c900ed88e10de39884167a484081b.tar.gz", - .hash = "googletest-1.15.2-AAAAAI0MAABls8Mqi55vY2QzQ1Da9H5AB7l4_Z5x5WMx", - }, .boringssl = .{ .url = "https://github.com/google/boringssl/archive/5622da92e1e7bacb5d0785ff5650a5a23b143b84.tar.gz", .hash = "N-V-__8AALNPTAg4NYYxg9JBYM-yGB8-T1iza-OvymI1uPJY", }, - .patch = .{ - .url = "git+https://github.com/akunaakwei/zig-patch.git#3e609dff44f5ddfc388b9498f72274466b8a677b", - .hash = "patch-2.6.1-po1jOVRtAAAGruHh4xmWulsWNmjhnfZKLvMbtfL1qieU", - }, .nasm = .{ .url = "git+https://github.com/sno2/nasm.git#31622af89d7e90af49d2e610d7dcdf36f8e23c7a", .hash = "nasm-2.16.3-B_NnpU5KAADHG19LPMfgWVyyYyQLDt8S2x3UFOLQfjiN", }, + .patch = .{ + .url = "git+https://github.com/akunaakwei/zig-patch.git#799ade2cd8954a38aba3d730de1a69891aa68234", + .hash = "patch-2.6.1-po1jORRvAAD4_gRpqMKvC00UPblvIpkxvnJdDpG4-DMY", + }, + .googletest = .{ + .url = "git+https://github.com/Ramblurr/googletest.git#a5039e675b047e953f6fa48459f060e7e2adef6d", + .hash = "googletest-1.17.0-yQyPFlqHCADfx6H5sGRUivaKCeepAeqfOv8t5K5Ilu7W", + }, }, .paths = .{ "build.zig", From 7473d0f55612bf710f132217f8f785676ad2ce2b Mon Sep 17 00:00:00 2001 From: Casey Link Date: Mon, 20 Oct 2025 12:51:34 +0200 Subject: [PATCH 2/6] Add boringssl's decrepit --- build.zig | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 7a6cf2d..9b6ddb0 100644 --- a/build.zig +++ b/build.zig @@ -18,8 +18,8 @@ const BuildSource = struct { bssl: BoringSSLModule, crypto: BoringSSLModule, crypto_test: BoringSSLModule, - // decrepit: BoringSSLModule, - // decrepit_test: BoringSSLModule, + decrepit: BoringSSLModule, + decrepit_test: BoringSSLModule, // fuzz: BoringSSLModule, // modulewrapper: BoringSSLModule, // pki: BoringSSLModule, @@ -210,6 +210,27 @@ pub fn build(b: *std.Build) !void { .kind = .lib, .dependencies = &.{ gtest, gmock }, }, + ModuleInfo{ + .name = "decrepit", + .module = &build_source.decrepit, + .kind = .lib, + .module_dependencies = &.{ + "crypto", + }, + }, + ModuleInfo{ + .name = "decrepit_test", + .module = &build_source.decrepit_test, + .kind = .exe, + .module_dependencies = &.{ + "decrepit", + "crypto", + "bcm", + "test_support", + }, + .dependencies = &.{ gtest, gmock }, + .system_dependencies = if (target.result.os.tag == .windows) &.{ "ws2_32", "dbghelp" } else &.{}, + }, ModuleInfo{ .name = "ssl_test", .module = &build_source.ssl_test, From 79a163aeeeaf51472cbce6cca5f0e269d3c99875 Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Wed, 29 Oct 2025 09:37:07 +0100 Subject: [PATCH 3/6] use lukaskastern googletest --- build.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 4ec061d..dbf5ea4 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -16,8 +16,8 @@ .hash = "patch-2.6.1-po1jORRvAAD4_gRpqMKvC00UPblvIpkxvnJdDpG4-DMY", }, .googletest = .{ - .url = "git+https://github.com/Ramblurr/googletest.git#a5039e675b047e953f6fa48459f060e7e2adef6d", - .hash = "googletest-1.17.0-yQyPFlqHCADfx6H5sGRUivaKCeepAeqfOv8t5K5Ilu7W", + .url = "git+https://github.com/LukasKastern/googletest.git?ref=boringssl#84916a2eefd59e970ad79c8f067c678d8a72a8fb", + .hash = "googletest-1.15.2-WJyzm3oNAAB198ZoHl_qz-Dwizz6U9JGkjGyofBVZnDj", }, }, .paths = .{ From 912f8cbc5943fc372fbe286126de927b344230ac Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Wed, 29 Oct 2025 09:37:30 +0100 Subject: [PATCH 4/6] set libc fields directly - methods are deprecated in 0.15 --- build.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 9b6ddb0..c1c6142 100644 --- a/build.zig +++ b/build.zig @@ -302,8 +302,8 @@ pub fn build(b: *std.Build) !void { const mod = steps.get(module.name).?; // Link std - mod.linkLibC(); - mod.linkLibCpp(); + mod.root_module.link_libc = true; + mod.root_module.link_libcpp = true; // Add the sources from the json module to the zig mod try addSourceFilesFromModule(b, upstream_root, mod, module.module, nasm); From 96c553c55803bf4c9ec841b60e50537053a6b85f Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Wed, 29 Oct 2025 09:37:38 +0100 Subject: [PATCH 5/6] upgrade workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fca9e61..d2dbbb9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v1 with: - version: 0.14.0 + version: 0.15.2 - name: Build run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }} From 80dc60c6d71610f07bf8d6fae145ca8defe6c0c5 Mon Sep 17 00:00:00 2001 From: Lukas Kastern Date: Wed, 29 Oct 2025 09:48:08 +0100 Subject: [PATCH 6/6] upgrade setup-zig --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2dbbb9..b27e327 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: submodules: recursive - name: Setup Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: version: 0.15.2