From 43595de12da7fe58e4209560558bddfb0f195d0e Mon Sep 17 00:00:00 2001 From: Antoine Date: Thu, 24 Jul 2025 23:08:20 +0200 Subject: [PATCH] build: support 0.15.0-dev addStaticLibrary -> addLibrary target and optimize are now in a module --- .github/workflows/ci.yaml | 6 +++--- build.zig | 24 +++++++++--------------- readme.md | 11 ++++++----- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b3adf13..2a564aa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,10 +12,10 @@ jobs: strategy: fail-fast: false matrix: - zig-version: ["0.14.0"] + zig-version: ["0.14.1"] os: [macos-latest, windows-latest] include: - - zig-version: "0.14.0" + - zig-version: "0.14.1" check-format: true os: ubuntu-latest build-options: "-Dbuild-apps" @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v4 - name: Setup Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: version: ${{ matrix.zig-version }} diff --git a/build.zig b/build.zig index e9fe3e2..2899e39 100644 --- a/build.zig +++ b/build.zig @@ -11,36 +11,30 @@ pub fn build(b: *std.Build) !void { const upstream = b.dependency("libressl", .{}); const libressl_common: LibreSslCommon = .{ - .libcrypto = b.addStaticLibrary(.{ + .libcrypto = b.addLibrary(.{ .name = "crypto", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), - .libssl = b.addStaticLibrary(.{ + .libssl = b.addLibrary(.{ .name = "ssl", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), - .libtls = b.addStaticLibrary(.{ + .libtls = b.addLibrary(.{ .name = "tls", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), .apps = .{ .nc = b.addExecutable(.{ .name = "nc", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), .ocspcheck = b.addExecutable(.{ .name = "ocspcheck", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), .openssl = b.addExecutable(.{ .name = "openssl", - .target = target, - .optimize = optimize, + .root_module = b.createModule(.{ .target = target, .optimize = optimize }), }), }, }; diff --git a/readme.md b/readme.md index cfca007..b639a72 100644 --- a/readme.md +++ b/readme.md @@ -38,8 +38,9 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp ## Zig Version Support Matrix -| Refname | LibreSSL Version | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` | -|-----------|------------------|--------------|--------------|--------------| -| `4.0.0+2` | `4.0.0` | ✅ | ❌ | ❌ | -| `4.0.0+1` | `4.0.0` | ❌ | ✅ | ✅ | -| `3.9.2+1` | `3.9.2` | ❌ | ✅ | ✅ | +| Refname | LibreSSL Version | Zig `0.15.0-dev` | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` | +|-----------|------------------|------------------|--------------|--------------|--------------| +| `4.0.0+3` | `4.0.0` | ✅ | ✅ | ❌ | ❌ | +| `4.0.0+2` | `4.0.0` | ❌ | ✅ | ❌ | ❌ | +| `4.0.0+1` | `4.0.0` | ❌ | ❌ | ✅ | ✅ | +| `3.9.2+1` | `3.9.2` | ❌ | ❌ | ✅ | ✅ |