From 90d46db2406f001cb5017a275fa2902ec6bc51f9 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 16 Jan 2025 12:55:52 +0100
Subject: [PATCH] Add the ability to override the libsodium install dirs
---
build.zig | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/build.zig b/build.zig
index 5f27ab0..da609af 100644
--- a/build.zig
+++ b/build.zig
@@ -46,12 +46,21 @@ pub fn build(b: *std.Build) !void {
minisign.root_module.addCMacro("LIBZODIUM", "1");
minisign.linkLibrary(libzodium);
} else {
+ var override_pkgconfig = false;
+ if (std.posix.getenv("LIBSODIUM_INCLUDE_PATH")) |path| {
+ minisign.addSystemIncludePath(.{ .cwd_relative = path });
+ override_pkgconfig = true;
+ }
+ if (std.posix.getenv("LIBSODIUM_LIB_PATH")) |path| {
+ minisign.addLibraryPath(.{ .cwd_relative = path });
+ override_pkgconfig = true;
+ }
minisign.addLibraryPath(.{ .cwd_relative = "/opt/homebrew/lib" });
minisign.addLibraryPath(.{ .cwd_relative = "/usr/local/lib" });
minisign.root_module.linkSystemLibrary(
"sodium",
.{
- .use_pkg_config = .yes,
+ .use_pkg_config = if (override_pkgconfig) .no else .yes,
.preferred_link_mode = if (use_static_linking) .static else .dynamic,
},
);