04/33: gnu: Add zig-0.10.0-747.

[guix-commits]

hako pushed a commit to branch wip-zig-bootstrap
in repository guix.

commit 433a92c34094f3561db44f4c5e68be33c2f359be
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Mon Nov 11 10:48:46 2024 +0800

    gnu: Add zig-0.10.0-747.
    
    * gnu/packages/patches/zig-0.10.0-747-CallOptions.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Regisiter it.
    * gnu/packages/zig.scm (zig-0.10.0-747,%arguments-zig1): New variables.
    
    Change-Id: I06e3255cbb3a4ddea28a7d663c8f72040ce993af
---
 gnu/local.mk                                       |  1 +
 .../patches/zig-0.10.0-747-CallOptions.patch       | 28 +++++++++++++++
 gnu/packages/zig.scm                               | 41 ++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index fa87e86181..d45945cf8f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2360,6 +2360,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/zig-0.9-riscv-support.patch             \
   %D%/packages/patches/zig-0.10.0-610-bootstrap-resolve-conflicts.patch        
\
   %D%/packages/patches/zig-0.10.0-675-TypeOf-hack.patch        \
+  %D%/packages/patches/zig-0.10.0-747-CallOptions.patch        \
   %D%/packages/patches/zig-use-baseline-cpu-by-default.patch   \
   %D%/packages/patches/zig-use-system-paths.patch              \
   %D%/packages/patches/zsh-egrep-failing-test.patch            \
diff --git a/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch 
b/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch
new file mode 100644
index 0000000000..78c2244603
--- /dev/null
+++ b/gnu/packages/patches/zig-0.10.0-747-CallOptions.patch
@@ -0,0 +1,28 @@
+From 27f2553c1c53ec417181dfe30104df993dffdab1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
+Date: Tue, 5 Nov 2024 06:20:19 +0200
+Subject: [PATCH] 0.10.0-747-g7b2a936173 CallOptions + zig2-only
+
+---
+ CMakeLists.txt      | 19 -------------------
+ lib/std/builtin.zig |  5 +++++
+ 2 files changed, 5 insertions(+), 19 deletions(-)
+
+diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig
+index eb1212607d..5278906d43 100644
+--- a/lib/std/builtin.zig
++++ b/lib/std/builtin.zig
+@@ -1,5 +1,10 @@
+ const builtin = @import("builtin");
+ 
++pub const CallOptions = struct {
++    modifier: CallModifier = .auto,
++    stack: ?[]align(std.Target.stack_align) u8 = null,
++};
++
+ /// `explicit_subsystem` is missing when the subsystem is automatically 
detected,
+ /// so Zig standard library has the subsystem detection logic here. This 
should generally be
+ /// used rather than `explicit_subsystem`.
+-- 
+2.44.1
+
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 9f953475fc..89e1cd94b0 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -400,4 +400,45 @@ toolchain.  Among other features it provides
 (define %arguments-zig2+zig1
       (package-arguments zig-0.10.0-722))
 
+(define-public zig-0.10.0-747
+  (let ((commit "7b2a936173165002105ba5e76bed69654e132fea")
+        (revision "747")
+        (base zig-0.10.0-722))
+    (package
+      (inherit base)
+      (name "zig")
+      (version (git-version "0.10.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/ziglang/zig";)
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1z5ndywk4d1dcv2k3bw3n2zgjr3ysf3bi2ac4jhwqgnmzsw498wd"))
+                (patches (search-patches "zig-0.10.0-747-CallOptions.patch"))
+                (snippet '(delete-file "stage1/zig1.wasm"))))
+      (arguments
+       (substitute-keyword-arguments %arguments-zig2+zig1
+         ((#:phases phases '%standard-phases)
+          #~(modify-phases #$phases
+              (replace 'build-zig1
+                (lambda _
+                  (invoke "zig2" "build" "--zig-lib-dir" "lib"
+                          "update-zig1" "--verbose")))
+              (delete 'prepare-source)
+              (delete 'configure)
+              (delete 'build)
+              (delete 'install)
+              (delete 'check)))))
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (replace "zig" `(,base "out"))
+         (delete "zstd"))))))
+
+;; Build zig1.wasm with supplied zig2.
+(define %arguments-zig1
+  (package-arguments zig-0.10.0-747))
+
 (define-public zig zig-0.10)