Update for Zig 0.16.0 #3
+81
−47
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void { | |
| const target = b.standardTargetOptions(.{}); | ||
| const optimize = b.standardOptimizeOption(.{}); | ||
|
|
||
| const linkage = b.option(std.builtin.LinkMode, "linkage", "Link mode. Defaults to static") orelse .static; | ||
| const strip = b.option(bool, "strip", "Omit debug information"); | ||
| const pic = b.option(bool, "pie", "Produce Position Independent Code"); | ||
|
|
||
|
|
@@ -31,62 +31,64 @@ pub fn build(b: *std.Build) void { | |
| const exclude_compressors_dfast_and_up = b.option(bool, "exclude-compressors-dfast-and-up", "") orelse false; | ||
| const exclude_compressors_greedy_and_up = b.option(bool, "exclude-compressors-greedy-and-up", "") orelse false; | ||
|
|
||
| const module = b.createModule(.{ | ||
| .target = target, | ||
| .optimize = optimize, | ||
| .strip = strip, | ||
| .pic = pic, | ||
| .link_libc = true, | ||
| }); | ||
| const zstd = b.addLibrary(.{ | ||
| .linkage = linkage, | ||
| .name = "zstd", | ||
| .root_module = module, | ||
|
Comment on lines
-37
to
+44
Member
There was a problem hiding this comment. This makes the diff unnecessarily complicated. Can you keep the |
||
| }); | ||
| b.installArtifact(zstd); | ||
| module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = common_sources }); | ||
| // zstd does not install into its own subdirectory. :( | ||
| zstd.installHeader(upstream.path("lib/zstd.h"), "zstd.h"); | ||
| zstd.installHeader(upstream.path("lib/zdict.h"), "zdict.h"); | ||
| zstd.installHeader(upstream.path("lib/zstd_errors.h"), "zstd_errors.h"); | ||
| if (compression) module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = compression_sources }); | ||
| if (decompression) module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = decompress_sources }); | ||
| if (dictbuilder) module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = dict_builder_sources }); | ||
| if (deprecated) module.addCSourceFiles(.{ .root = upstream.path("lib"), .files = deprecated_sources }); | ||
| if (legacy_support != 0) { | ||
| for (legacy_support..8) |i| | ||
| module.addCSourceFile(.{ .file = upstream.path(b.fmt("lib/legacy/zstd_v0{d}.c", .{i})) }); | ||
| } | ||
|
|
||
| if (target.result.cpu.arch == .x86_64) { | ||
| if (decompression) { | ||
| module.addAssemblyFile(upstream.path("lib/decompress/huf_decompress_amd64.S")); | ||
| } | ||
| } else { | ||
| module.addCMacro("ZSTD_DISABLE_ASM", ""); | ||
| } | ||
|
|
||
| module.addCMacro("ZSTD_LEGACY_SUPPORT", b.fmt("{d}", .{legacy_support})); | ||
| if (multi_thread) module.addCMacro("ZSTD_MULTITHREAD", "1"); | ||
| if (disable_assembly) module.addCMacro("ZSTD_DISABLE_ASM", ""); | ||
| if (huf_force_decompress_x1) module.addCMacro("HUF_FORCE_DECOMPRESS_X1", ""); | ||
| if (huf_force_decompress_x2) module.addCMacro("HUF_FORCE_DECOMPRESS_X2", ""); | ||
| if (force_decompress_sequences_short) module.addCMacro("ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT", ""); | ||
| if (force_decompress_sequences_long) module.addCMacro("ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG", ""); | ||
| if (no_inline) module.addCMacro("ZSTD_NO_INLINE", ""); | ||
| if (strip_error_strings) module.addCMacro("ZSTD_STRIP_ERROR_STRINGS", ""); | ||
| if (exclude_compressors_dfast_and_up) { | ||
| module.addCMacro("ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR", ""); | ||
| } | ||
| if (exclude_compressors_greedy_and_up) { | ||
| module.addCMacro("ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR", ""); | ||
| module.addCMacro("ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR", ""); | ||
| } | ||
|
|
||
| { | ||
|
|
@@ -103,16 +105,17 @@ pub fn build(b: *std.Build) void { | |
| }; | ||
|
|
||
| for (examples) |name| { | ||
| const mod = b.createModule(.{ | ||
| .target = target, | ||
| .optimize = optimize, | ||
| }); | ||
| const exe = b.addExecutable(.{ | ||
| .name = name, | ||
| .root_module = mod, | ||
|
Comment on lines
-108
to
+114
Member
There was a problem hiding this comment. This makes the diff unnecessarily complicated. Can you keep the |
||
| }); | ||
| mod.addCSourceFile(.{ .file = upstream.path(b.fmt("examples/{s}.c", .{name})) }); | ||
| mod.addIncludePath(upstream.path("examples/common.c")); | ||
| mod.linkLibrary(zstd); | ||
| b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{ .dest_dir = .{ .override = .{ .custom = "examples" } } }).step); | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A statement like "Compatible with zig 0.16" is misleading because there is no 0.16.0 release (yet). You would have to mention the exact Zig version this has been tested with or say
0.16.0-dev. This can easily get outdated over time so I'd suggest to remove this statement entirely and let the user test whether it works with their Zig version instead.Also, projects in allyourcodebase only need to guarantee support for the latest tagged release. Anything beyond that may change over time.