kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

Update for zig-master

Browse Source
This commit is contained in:
Frank Denis 2024-01-04 12:07:16 +01:00
parent 93a6e79750
commit 3990da5802
1 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
build.zig
View File

@ -3,10 +3,10 @@ const fmt = std.fmt;
const fs = std.fs; const fs = std.fs;
const heap = std.heap; const heap = std.heap;
const mem = std.mem; const mem = std.mem;
const LibExeObjStep = std.build.LibExeObjStep; const Compile = std.Build.Step.Compile;
const Target = std.Target; const Target = std.Target;
pub fn build(b: *std.build.Builder) !void { pub fn build(b: *std.Build) !void {
const root_path = b.pathFromRoot("."); const root_path = b.pathFromRoot(".");
var cwd = try fs.openDirAbsolute(root_path, .{}); var cwd = try fs.openDirAbsolute(root_path, .{});
defer cwd.close(); defer cwd.close();
@ -28,19 +28,20 @@ pub fn build(b: *std.build.Builder) !void {
build_static = true; build_static = true;
} }
switch (target.getCpuArch()) { switch (target.result.cpu.arch) {
// Features we assume are always available because they won't affect // Features we assume are always available because they won't affect
// code generation in files that don't use them. // code generation in files that don't use them.
.x86_64 => { .x86_64 => {
target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.aes)); target.query.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.sse4_1));
target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.pclmul)); target.query.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.aes));
target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.rdrnd)); target.query.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.pclmul));
target.query.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.rdrnd));
}, },
.aarch64, .aarch64_be => { .aarch64, .aarch64_be => {
target.cpu_features_add.addFeature(@intFromEnum(Target.aarch64.Feature.crypto)); target.query.cpu_features_add.addFeature(@intFromEnum(Target.aarch64.Feature.crypto));
// ARM CPUs supported by Windows also support NEON. // ARM CPUs supported by Windows also support NEON.
if (target.isWindows()) { if (target.result.isMinGW()) {
target.cpu_features_add.addFeature(@intFromEnum(Target.aarch64.Feature.neon)); target.query.cpu_features_add.addFeature(@intFromEnum(Target.aarch64.Feature.neon));
} }
}, },
else => {}, else => {},
@ -52,13 +53,14 @@ pub fn build(b: *std.build.Builder) !void {
.optimize = optimize, .optimize = optimize,
}); });
const shared_lib = b.addSharedLibrary(.{ const shared_lib = b.addSharedLibrary(.{
.name = if (target.isWindows()) "sodium_shared" else "sodium", .name = if (target.result.isMinGW()) "sodium_shared" else "sodium",
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
.strip = optimize != .Debug and !target.result.isMinGW(),
}); });
// work out which libraries we are building // work out which libraries we are building
var libs = std.ArrayList(*LibExeObjStep).init(b.allocator); var libs = std.ArrayList(*Compile).init(b.allocator);
defer libs.deinit(); defer libs.deinit();
if (build_static) { if (build_static) {
try libs.append(static_lib); try libs.append(static_lib);
@ -76,14 +78,10 @@ pub fn build(b: *std.build.Builder) !void {
for (libs.items) |lib| { for (libs.items) |lib| {
if (lib.isDynamicLibrary() and if (lib.isDynamicLibrary() and
!(target.isDarwin() or target.isDragonFlyBSD() or target.isFreeBSD() or !(target.result.isDarwin() or target.result.isBSD() or target.result.isGnu() or target.result.isAndroid() or target.result.isMinGW()))
target.isLinux() or target.isNetBSD() or target.isOpenBSD() or target.isWindows()))
{ {
continue; continue;
} }
if (optimize != .Debug and !target.isWindows() and !lib.isStaticLibrary()) {
lib.strip = true;
}
b.installArtifact(lib); b.installArtifact(lib);
lib.installHeader(src_path ++ "/include/sodium.h", "sodium.h"); lib.installHeader(src_path ++ "/include/sodium.h", "sodium.h");
lib.installHeadersDirectory(src_path ++ "/include/sodium", "sodium"); lib.installHeadersDirectory(src_path ++ "/include/sodium", "sodium");
@ -102,15 +100,13 @@ pub fn build(b: *std.build.Builder) !void {
lib.defineCMacro("HAVE_STDINT_H", "1"); lib.defineCMacro("HAVE_STDINT_H", "1");
lib.defineCMacro("HAVE_TI_MODE", "1"); lib.defineCMacro("HAVE_TI_MODE", "1");
if (target.cpu_arch) |arch| { const endian = target.result.cpu.arch.endian();
const endian = arch.endian(); switch (endian) {
switch (endian) { .big => lib.defineCMacro("NATIVE_BIG_ENDIAN", "1"),
.big => lib.defineCMacro("NATIVE_BIG_ENDIAN", "1"), .little => lib.defineCMacro("NATIVE_LITTLE_ENDIAN", "1"),
.little => lib.defineCMacro("NATIVE_LITTLE_ENDIAN", "1"),
}
} }
switch (target.getOsTag()) { switch (target.result.os.tag) {
.linux => { .linux => {
lib.defineCMacro("ASM_HIDE_SYMBOL", ".hidden"); lib.defineCMacro("ASM_HIDE_SYMBOL", ".hidden");
lib.defineCMacro("TLS", "_Thread_local"); lib.defineCMacro("TLS", "_Thread_local");
@ -184,7 +180,7 @@ pub fn build(b: *std.build.Builder) !void {
else => {}, else => {},
} }
switch (target.getCpuArch()) { switch (target.result.cpu.arch) {
.x86_64 => { .x86_64 => {
lib.defineCMacro("HAVE_AMD64_ASM", "1"); lib.defineCMacro("HAVE_AMD64_ASM", "1");
lib.defineCMacro("HAVE_AVX_ASM", "1"); lib.defineCMacro("HAVE_AVX_ASM", "1");
@ -192,7 +188,7 @@ pub fn build(b: *std.build.Builder) !void {
lib.defineCMacro("HAVE_MMINTRIN_H", "1"); lib.defineCMacro("HAVE_MMINTRIN_H", "1");
lib.defineCMacro("HAVE_EMMINTRIN_H", "1"); lib.defineCMacro("HAVE_EMMINTRIN_H", "1");
const cpu_features = target.getCpuFeatures(); const cpu_features = target.result.cpu.features;
const has_sse3 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.sse3)); const has_sse3 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.sse3));
const has_ssse3 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.ssse3)); const has_ssse3 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.ssse3));
const has_sse4_1 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.sse4_1)); const has_sse4_1 = cpu_features.isEnabled(@intFromEnum(Target.x86.Feature.sse4_1));
@ -213,7 +209,7 @@ pub fn build(b: *std.build.Builder) !void {
if (has_rdrnd) lib.defineCMacro("HAVE_RDRAND", "1"); if (has_rdrnd) lib.defineCMacro("HAVE_RDRAND", "1");
}, },
.aarch64, .aarch64_be => { .aarch64, .aarch64_be => {
const cpu_features = target.getCpuFeatures(); const cpu_features = target.result.cpu.features;
const has_neon = cpu_features.isEnabled(@intFromEnum(Target.aarch64.Feature.neon)); const has_neon = cpu_features.isEnabled(@intFromEnum(Target.aarch64.Feature.neon));
const has_crypto = cpu_features.isEnabled(@intFromEnum(Target.aarch64.Feature.crypto)); const has_crypto = cpu_features.isEnabled(@intFromEnum(Target.aarch64.Feature.crypto));
if (has_neon and has_crypto) { if (has_neon and has_crypto) {
@ -226,22 +222,13 @@ pub fn build(b: *std.build.Builder) !void {
else => {}, else => {},
} }
switch (target.getOsTag()) { switch (target.result.os.tag) {
.wasi => { .wasi => {
lib.defineCMacro("__wasi__", "1"); lib.defineCMacro("__wasi__", "1");
}, },
else => {}, else => {},
} }
switch (target.getCpuArch()) {
.x86_64 => {
lib.target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.sse4_1));
lib.target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.aes));
lib.target.cpu_features_add.addFeature(@intFromEnum(Target.x86.Feature.pclmul));
},
else => {},
}
const allocator = heap.page_allocator; const allocator = heap.page_allocator;
var walker = try src_dir.walk(allocator); var walker = try src_dir.walk(allocator);
while (try walker.next()) |entry| { while (try walker.next()) |entry| {
@ -286,9 +273,9 @@ pub fn build(b: *std.build.Builder) !void {
.name = exe_name, .name = exe_name,
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
.strip = true,
}); });
exe.linkLibC(); exe.linkLibC();
exe.strip = true;
exe.linkLibrary(static_lib); exe.linkLibrary(static_lib);
exe.addIncludePath(.{ .path = "src/libsodium/include" }); exe.addIncludePath(.{ .path = "src/libsodium/include" });
exe.addIncludePath(.{ .path = "test/quirks" }); exe.addIncludePath(.{ .path = "test/quirks" });