hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit f2d45cfd27b2d19b56359c952a528515792fbe55
Author: Hilton Chain <[email protected]>
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): New variables.
Change-Id: I06e3255cbb3a4ddea28a7d663c8f72040ce993af
---
gnu/local.mk | 1 +
.../patches/zig-0.10.0-747-CallOptions.patch | 28 ++++++++++++++++
gnu/packages/zig.scm | 37 ++++++++++++++++++++++
3 files changed, 66 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 71fb6fbda4..6b6b2a66ca 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2367,6 +2367,7 @@ dist_patch_DATA =
\
%D%/packages/patches/zig-0.10-use-system-paths.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?= <[email protected]>
+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 1f91d0c8a1..b4b7c47df0 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -402,4 +402,41 @@ toolchain. Among other features it provides
(prepend zstd)
(replace "zig" `(,base "zig1")))))))
+;; Supply zig2, build zig1.wasm, install zig1.wasm.
+(define 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
+ (let ((base (zig-source
+ version commit
+ "1z5ndywk4d1dcv2k3bw3n2zgjr3ysf3bi2ac4jhwqgnmzsw498wd")))
+ (origin
+ (inherit base)
+ (patches
+ (append (origin-patches base)
+ (search-patches
+ "zig-0.10.0-747-CallOptions.patch"))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments zig-0.10.0-722)
+ ((#: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"))))))
+
(define-public zig zig-0.10)
