From f59c9dbb71153d0be62f7afcf4a1c9e8a4d59619 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Tue, 4 Jul 2023 03:16:51 +0300 Subject: Use build.zig.zon for fetching libarchive --- build.zig | 5 ++--- build.zig.zon | 4 ++++ libs/libarchive | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 160000 libs/libarchive diff --git a/build.zig b/build.zig index 94cccf9..dbcfc7b 100644 --- a/build.zig +++ b/build.zig @@ -15,6 +15,7 @@ pub fn build(b: *Build) void { const clap = b.dependency("clap", .{}); const curl = b.dependency("curl", .{}); + const libarchive = b.dependency("libarchive", .{}); const exe = b.addExecutable(.{ .name = "zup", @@ -26,9 +27,7 @@ pub fn build(b: *Build) void { exe.addOptions("zup-config", config); exe.addModule("clap", clap.module("clap")); exe.addModule("curl", curl.module("curl")); - exe.addModule("libarchive", b.createModule(.{ - .source_file = .{ .path = "libs/libarchive/libarchive.zig" }, - })); + exe.addModule("libarchive", libarchive.module("libarchive")); exe.addModule("xdg", b.createModule(.{ .source_file = .{ .path = "libs/xdg/xdg.zig" } })); exe.linkLibC(); exe.linkSystemLibrary("libarchive"); diff --git a/build.zig.zon b/build.zig.zon index 276ecef..72d7b61 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -11,5 +11,9 @@ .url = "https://git.sr.ht/~ukko/zig-curl/archive/aa55a3d061fceebf737c0af25a6df2d05f83bcad.tar.gz", .hash = "12208fc84cbd67383b6fe7e3f65a965cead4577ca27cd59660a2812c9f4edc545c5e", }, + .libarchive = .{ + .url = "https://git.sr.ht/~ukko/zig-libarchive/archive/b70c51b8555e68e73c36b0e691dff65c0092baf6.tar.gz", + .hash = "12206a8120d9a7550112f2fcc908c46900d6882c95156f900d5e0b39fcdb6a64a065", + }, }, } diff --git a/libs/libarchive b/libs/libarchive deleted file mode 160000 index 5074793..0000000 --- a/libs/libarchive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50747939555b62e3b830c1ec307f746e35b94ec6 -- cgit v1.2.3