Compare commits

..

No commits in common. "fead2457be2e93c5b1383f4648c76454eacdb6dc" and "aa27cc803ca4f1fca6444f3f0d819d6195786bd8" have entirely different histories.

4 changed files with 12 additions and 19 deletions

View File

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

View File

@ -55,8 +55,6 @@ pub fn build(b: *std.Build) void {
lib.linkSystemLibrary("dbghelp"); lib.linkSystemLibrary("dbghelp");
lib.linkSystemLibrary("ole32"); lib.linkSystemLibrary("ole32");
lib.linkSystemLibrary("shell32"); lib.linkSystemLibrary("shell32");
if (optimize == .Debug)
lib.linkSystemLibrary("ucrtbased");
lib.addCSourceFiles(.{ lib.addCSourceFiles(.{
.root = src_root, .root = src_root,
.files = win_sources, .files = win_sources,
@ -83,10 +81,10 @@ pub fn build(b: *std.Build) void {
include_root.path(b, "uv/unix.h"), include_root.path(b, "uv/unix.h"),
"uv/unix.h", "uv/unix.h",
); );
if (!tinfo.abi.isAndroid()) if (!tinfo.isAndroid())
lib.linkSystemLibrary("pthread"); lib.linkSystemLibrary("pthread");
if (tinfo.os.tag.isDarwin()) { if (tinfo.isDarwin()) {
lib.root_module.addCMacro("_DARWIN_UNLIMITED_SELECT", "1"); lib.root_module.addCMacro("_DARWIN_UNLIMITED_SELECT", "1");
lib.root_module.addCMacro("_DARWIN_USE_64_BIT_INODE", "1"); lib.root_module.addCMacro("_DARWIN_USE_64_BIT_INODE", "1");
lib.addCSourceFiles(.{ lib.addCSourceFiles(.{
@ -98,7 +96,7 @@ pub fn build(b: *std.Build) void {
include_root.path(b, "uv/darwin.h"), include_root.path(b, "uv/darwin.h"),
"uv/darwin.h", "uv/darwin.h",
); );
} else if (tinfo.abi.isAndroid()) { } else if (tinfo.isAndroid()) {
lib.root_module.addCMacro("_GNU_SOURCE", ""); lib.root_module.addCMacro("_GNU_SOURCE", "");
lib.linkSystemLibrary("dl"); lib.linkSystemLibrary("dl");
lib.addCSourceFiles(.{ lib.addCSourceFiles(.{

View File

@ -1,12 +1,11 @@
.{ .{
.name = .libuv, .name = "libuv",
.fingerprint = 0x7CB3932CBFAADA86,
.version = "1.5.0", .version = "1.5.0",
.minimum_zig_version = "0.14.0", .minimum_zig_version = "0.13.0",
.dependencies = .{ .dependencies = .{
.libuv = .{ .libuv = .{
.url = "git+https://github.com/libuv/libuv?ref=v1.50.0#8fb9cb919489a48880680a56efecff6a7dfb4504", .url = "git+https://github.com/libuv/libuv?ref=v1.50.0#8fb9cb919489a48880680a56efecff6a7dfb4504",
.hash = "N-V-__8AAH34QwB6wi5eQK_lFbfDGSN3hRE8l-6Ep198ZsGg", .hash = "12207ac22e5e40afe515b7c319237785113c97ee84a75f7c66c1a0e7cc6e743debeb",
}, },
}, },
.paths = .{ .paths = .{

View File

@ -35,8 +35,8 @@ your_exe.linkLibrary(libuv_dep.artifact("uv"));
## Zig Version Support Matrix ## Zig Version Support Matrix
| Refname | libuv Version | Zig `0.14.0` | | Refname | libuv Version | Zig `0.13` | Zig `0.14.0-dev` |
|-----------|----------------|--------------| |-----------|----------------|------------|------------------|
| | `1.50.0` | ✅ | | | `1.50.0` | ✅ | ✅ |
[libuv]: https://github.com/libuv [libuv]: https://github.com/libuv