build: support 0.14.0

Unfortunately, this has irreconcilable incompatibilities with previous
versions of zig, due to the build.zig.zon schema changes. Support for
older versions has been dropped.
This commit is contained in:
torque 2025-03-05 19:17:31 -07:00
parent fd0fe77715
commit 18d16b2663
Signed by: torque
SSH Key Fingerprint: SHA256:nCrXefBNo6EbjNSQhv0nXmEg/VuNq3sMF5b8zETw3Tk
4 changed files with 17 additions and 13 deletions

View File

@ -12,15 +12,17 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
zig-version: ["0.13.0"] zig-version: ["0.14.0"]
os: [ubuntu-latest, macos-latest, windows-latest] os: [macos-latest, windows-latest]
include: include:
- zig-version: "0.12.1" - zig-version: "0.14.0"
os: ubuntu-latest
- zig-version: "master"
check-format: true check-format: true
os: ubuntu-latest os: ubuntu-latest
build-options: "-Dbuild-apps" build-options: "-Dbuild-apps"
- zig-version: "master"
os: ubuntu-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout - name: Checkout

View File

@ -151,7 +151,7 @@ pub fn build(b: *std.Build) !void {
} else { } else {
build_asm = false; build_asm = false;
} }
} else if (tinfo.isDarwin() and tinfo.cpu.arch == .x86_64) { } else if (tinfo.os.tag.isDarwin() and tinfo.cpu.arch == .x86_64) {
libressl_common.libcrypto.addCSourceFiles(.{ libressl_common.libcrypto.addCSourceFiles(.{
.root = crypto_srcroot, .root = crypto_srcroot,
.files = libcrypto_macos_x86_64_asm, .files = libcrypto_macos_x86_64_asm,
@ -338,7 +338,7 @@ pub fn build(b: *std.Build) !void {
libressl_common.linkSystemLibrary("bcrypt"); libressl_common.linkSystemLibrary("bcrypt");
}, },
else => if (tinfo.isDarwin()) { else => if (tinfo.os.tag.isDarwin()) {
libressl_common.libcrypto.addCSourceFiles(.{ libressl_common.libcrypto.addCSourceFiles(.{
.root = crypto_srcroot, .root = crypto_srcroot,
.files = libcrypto_unix_sources, .files = libcrypto_unix_sources,

View File

@ -1,11 +1,12 @@
.{ .{
.name = "libressl", .name = .libressl,
.fingerprint = 0x203FA82BE0954AFA,
.version = "4.0.0", .version = "4.0.0",
.minimum_zig_version = "0.12.0", .minimum_zig_version = "0.14.0",
.dependencies = .{ .dependencies = .{
.libressl = .{ .libressl = .{
.url = "https://github.com/libressl/portable/releases/download/v4.0.0/libressl-4.0.0.tar.gz", .url = "https://github.com/libressl/portable/releases/download/v4.0.0/libressl-4.0.0.tar.gz",
.hash = "1220c6577f1aa9137d3c200b804838fd71315388eec5d4c9313550143d02fe69308b", .hash = "N-V-__8AAGvDTQHGV38aqRN9PCALgEg4_XExU4juxdTJMTVQ",
}, },
}, },
.paths = .{ .paths = .{

View File

@ -38,7 +38,8 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp
## Zig Version Support Matrix ## Zig Version Support Matrix
| Refname | LibreSSL Version | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.0-dev` | | Refname | LibreSSL Version | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.x` |
|-----------|------------------|--------------|--------------|------------------| |-----------|------------------|--------------|--------------|------------------|
| `3.9.2+1` | `3.9.2` | ✅ | ✅ | ✅ | | `3.9.2+1` | `3.9.2` | ✅ | ✅ | ❌ |
| `4.0.0+1` | `4.0.0` | ✅ | ✅ | ✅ | | `4.0.0+1` | `4.0.0` | ✅ | ✅ | ❌ |
| `4.0.0+2` | `4.0.0` | ❌ | ❌ | ✅ |