Skip to content

Commit 43595de

Browse files
committed
build: support 0.15.0-dev
addStaticLibrary -> addLibrary target and optimize are now in a module
1 parent 45ba485 commit 43595de

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
zig-version: ["0.14.0"]
15+
zig-version: ["0.14.1"]
1616
os: [macos-latest, windows-latest]
1717
include:
18-
- zig-version: "0.14.0"
18+
- zig-version: "0.14.1"
1919
check-format: true
2020
os: ubuntu-latest
2121
build-options: "-Dbuild-apps"
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@v4
3030

3131
- name: Setup Zig
32-
uses: mlugg/setup-zig@v1
32+
uses: mlugg/setup-zig@v2
3333
with:
3434
version: ${{ matrix.zig-version }}
3535

build.zig

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,30 @@ pub fn build(b: *std.Build) !void {
1111

1212
const upstream = b.dependency("libressl", .{});
1313
const libressl_common: LibreSslCommon = .{
14-
.libcrypto = b.addStaticLibrary(.{
14+
.libcrypto = b.addLibrary(.{
1515
.name = "crypto",
16-
.target = target,
17-
.optimize = optimize,
16+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
1817
}),
19-
.libssl = b.addStaticLibrary(.{
18+
.libssl = b.addLibrary(.{
2019
.name = "ssl",
21-
.target = target,
22-
.optimize = optimize,
20+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
2321
}),
24-
.libtls = b.addStaticLibrary(.{
22+
.libtls = b.addLibrary(.{
2523
.name = "tls",
26-
.target = target,
27-
.optimize = optimize,
24+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
2825
}),
2926
.apps = .{
3027
.nc = b.addExecutable(.{
3128
.name = "nc",
32-
.target = target,
33-
.optimize = optimize,
29+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
3430
}),
3531
.ocspcheck = b.addExecutable(.{
3632
.name = "ocspcheck",
37-
.target = target,
38-
.optimize = optimize,
33+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
3934
}),
4035
.openssl = b.addExecutable(.{
4136
.name = "openssl",
42-
.target = target,
43-
.optimize = optimize,
37+
.root_module = b.createModule(.{ .target = target, .optimize = optimize }),
4438
}),
4539
},
4640
};

readme.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp
3838

3939
## Zig Version Support Matrix
4040

41-
| Refname | LibreSSL Version | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` |
42-
|-----------|------------------|--------------|--------------|--------------|
43-
| `4.0.0+2` | `4.0.0` ||||
44-
| `4.0.0+1` | `4.0.0` ||||
45-
| `3.9.2+1` | `3.9.2` ||||
41+
| Refname | LibreSSL Version | Zig `0.15.0-dev` | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` |
42+
|-----------|------------------|------------------|--------------|--------------|--------------|
43+
| `4.0.0+3` | `4.0.0` |||||
44+
| `4.0.0+2` | `4.0.0` |||||
45+
| `4.0.0+1` | `4.0.0` |||||
46+
| `3.9.2+1` | `3.9.2` |||||

0 commit comments

Comments
 (0)