Merge pull request #1 from pwndbg/zig0.16

Zig0.16

Author: patryk4815

.github/workflows/tests.yml

@@ -0,0 +1,56 @@
+name: Tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  tests-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        attribute: [
+          packages.aarch64-linux.pkgsCross.armv7l-hf-multiplatform.libdebuginfod-zig-static  # arm32
+          packages.aarch64-linux.pkgsCross.aarch64-multiplatform.libdebuginfod-zig-static  # arm64
+          packages.aarch64-linux.pkgsCross.gnu32.libdebuginfod-zig-static # x86_32
+          packages.aarch64-linux.pkgsCross.gnu64.libdebuginfod-zig-static # x86_64
+          packages.aarch64-linux.pkgsCross.riscv64.libdebuginfod-zig-static # riscv64
+          packages.aarch64-linux.pkgsCross.s390x.libdebuginfod-zig-static # s390x
+          packages.aarch64-linux.pkgsCross.powernv.libdebuginfod-zig-static # ppc64le
+          packages.aarch64-linux.pkgsCross.ppc64.libdebuginfod-zig-static # ppc64
+          packages.aarch64-linux.pkgsCross.loongarch64-linux.libdebuginfod-zig-static  # loong64
+        ]
+    runs-on: ubuntu-24.04-arm  # aarch64-linux
+    timeout-minutes: 30
+    env:
+      TMPDIR: /tmp
+    steps:
+    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9  # @v3
+    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72  # @v30
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+
+    - name: build ${{ matrix.attribute }}
+      run: nix build '.#${{ matrix.attribute }}' -L --accept-flake-config -o result
+
+  tests-darwin:
+    strategy:
+      fail-fast: false
+      matrix:
+        attribute: [
+          packages.aarch64-darwin.static  # arm64
+          packages.x86_64-darwin.static  # x86_64
+        ]
+    runs-on: macos-15  # aarch64-darwin
+    timeout-minutes: 30
+    env:
+      TMPDIR: /tmp
+    steps:
+    - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9  # @v3
+    - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72  # @v30
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+
+    - name: build ${{ matrix.attribute }}
+      run: nix build '.#${{ matrix.attribute }}' -L --accept-flake-config -o result

README.md

@@ -26,14 +26,13 @@ zig build -Dtarget=aarch64-macos -Doptimize=ReleaseSafe
 
 # How to replace GDB debuginfod with this repo?
 ```
-git clone https://github.com/pwndbg/debuginfod-zig
-cd debuginfod-zig
-zig build -Doptimize=ReleaseSafe -Dlinkage=dynamic
-cp ./zig-out/lib/libdebuginfo.so /usr/lib64/libdebuginfod.so.1
-```
-> NOTE1: please download zig 0.15.1 - https://ziglang.org/download/
+nix build github:pwndbg/debuginfod-zig/zig0.16#dynamic
+cp ./result/lib/libdebuginfo.so /usr/lib64/libdebuginfod.so.1
 
-> NOTE2: `/usr/lib64/libdebuginfod.so.1` path depends on your distribution
+# OR use env `LD_PRELOAD`
+LD_PRELOAD=./result/lib/libdebuginfo.so /usr/bin/gdb
+```
+> NOTE1: `/usr/lib64/libdebuginfod.so.1` path depends on your distribution
 
 ## ENV's implemented:
 - DEBUGINFOD_URLS
@@ -43,11 +42,11 @@ cp ./zig-out/lib/libdebuginfo.so /usr/lib64/libdebuginfod.so.1
 - DEBUGINFOD_VERBOSE
 - DEBUGINFOD_PROGRESS
 - DEBUGINFOD_HEADERS_FILE
+- DEBUGINFOD_TIMEOUT
 
 ## ENV's not-implemented:
-- DEBUGINFOD_TIMEOUT (hard)
-- DEBUGINFOD_RETRY_LIMIT (easy)
 - DEBUGINFOD_IMA_CERT_PATH (hard?)
+- DEBUGINFOD_RETRY_LIMIT
 
 ## What is missing:
 - missing func debuginfod_find_metadata

build.zig

@@ -3,20 +3,24 @@ const manifest = @import("build.zig.zon");
 
 pub fn generatePkgconfig(b: *std.Build, version: std.SemanticVersion) !*std.Build.Step.InstallFile {
     const allocator = b.allocator;
-    const version_str = try std.fmt.allocPrint(allocator, "{d}.{d}", .{version.major, version.minor});
+    const version_str = try std.fmt.allocPrint(allocator, "{d}.{d}", .{ version.major, version.minor });
     const absolute_prefix = b.install_prefix;
     if (!std.fs.path.isAbsolute(absolute_prefix)) {
         @panic("Prefix must be absolute!");
     }
 
+    var threaded: std.Io.Threaded = .init(allocator);
+    defer threaded.deinit();
+    const io = threaded.io();
+
     const input_file = try std.fs.cwd().openFile("upstream/libdebuginfod.pc.in", .{});
     defer input_file.close();
 
     var aw = try std.Io.Writer.Allocating.initCapacity(allocator, 0);
     defer aw.deinit();
 
     var buf: [0]u8 = undefined;
-    var reader = input_file.reader(&buf);
+    var reader = input_file.reader(io, &buf);
     _ = try reader.interface.stream(&aw.writer, .unlimited);
 
     var text = try aw.toOwnedSlice();
@@ -26,7 +30,7 @@ pub fn generatePkgconfig(b: *std.Build, version: std.SemanticVersion) !*std.Buil
     text = try std.mem.replaceOwned(u8, allocator, text, "@VERSION@", version_str);
 
     const tmp_dir = b.makeTempPath();
-    const tmp_file = try std.fs.path.join(allocator, &.{tmp_dir, "libdebuginfod.pc"});
+    const tmp_file = try std.fs.path.join(allocator, &.{ tmp_dir, "libdebuginfod.pc" });
     const out_file = try std.fs.cwd().createFile(tmp_file, .{});
     defer out_file.close();
     try out_file.writeAll(text);
@@ -69,7 +73,7 @@ pub fn build(b: *std.Build) !void {
         .root_module = lib_mod,
         .version = version,
     });
-    if(linkage == .static) {
+    if (linkage == .static) {
         lib.bundle_compiler_rt = true;
         lib.pie = true;
     }
@@ -82,7 +86,7 @@ pub fn build(b: *std.Build) !void {
         .root_module = lib_mod,
     });
     const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests);
-
+    b.installArtifact(lib_unit_tests);
     const test_step = b.step("test", "Run unit tests");
     test_step.dependOn(&run_lib_unit_tests.step);
 }

build.zig.zon

@@ -28,7 +28,7 @@
 
     // Tracks the earliest Zig version that the package considers to be a
     // supported use case.
-    .minimum_zig_version = "0.15.1",
+    .minimum_zig_version = "0.16.0",
 
     // This field is optional.
     // Each dependency must either provide a `url` and `hash`, or a `path`.

flake.lock

@@ -0,0 +1,88 @@
+{
+  description = "debuginfo-zig";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    zig.url = "github:mitchellh/zig-overlay";
+  };
+
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      zig,
+      ...
+    }:
+    let
+      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+      lib = nixpkgs.lib;
+
+      fun_zig_0_16 =
+        pkgs:
+        (
+          let
+            dev_zig = zig.packages.${pkgs.stdenv.hostPlatform.system}."master-2025-11-02" // {
+              meta = {
+                platforms = pkgs.lib.platforms.all;
+                broken = false;
+                maintainers = [ ];
+              };
+            };
+            dev_zig_hook = pkgs.zig.hook.override { zig = dev_zig; };
+          in
+          dev_zig // { hook = dev_zig_hook; }
+        );
+
+      fun_libdebuginfod = pkgs: attrs: pkgs.callPackage ./pkg.nix attrs;
+
+      overlay = (
+        final: prev: {
+          dev_zig_0_16 = (fun_zig_0_16 prev);
+          libdebuginfod-zig-static = (
+            fun_libdebuginfod prev {
+              flags = [ "-Dlinkage=static" ];
+            }
+          );
+          libdebuginfod-zig-dynamic = (
+            fun_libdebuginfod prev {
+              flags = [ "-Dlinkage=dynamic" ];
+            }
+          );
+        }
+      );
+
+      fun_pkgs =
+        system:
+        import nixpkgs {
+          inherit system;
+          overlays = [
+            overlay
+          ];
+        };
+    in
+    {
+      overlays.default = overlay;
+      packages = forAllSystems (
+        system:
+        let
+          pkgs = (fun_pkgs system);
+        in
+        {
+          static = pkgs.libdebuginfod-zig-static;
+          dynamic = pkgs.libdebuginfod-zig-dynamic;
+          default = self.packages.${system}.dynamic;
+          pkgsCross = pkgs.pkgsCross;
+        }
+      );
+      develop = forAllSystems (
+        system:
+        let
+          pkgs = (fun_pkgs system);
+        in
+        {
+          default = pkgs.dev_zig_0_16;
+        }
+      );
+      formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-tree);
+    };
+}