hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 311a48145deaddec27c3af9fc3b37d3299838bdd
Author: Hilton Chain <[email protected]>
AuthorDate: Wed Nov 13 23:48:56 2024 +0800
gnu: Add zig-0.11.0-3501.
* gnu/packages/patches/zig-0.12-use-system-paths.patch: New file.
* gnu/local.mk (dist_patch_DATA): Regisiter it.
* gnu/packages/zig.scm (zig-source): Use it.
(zig-0.11.0-3501): New variable.
Change-Id: Ia487a9e08bcb12169becf5b834cb9c14088f5f18
---
gnu/local.mk | 1 +
.../patches/zig-0.12-use-system-paths.patch | 47 ++++++++++++++++++++++
gnu/packages/zig.scm | 23 ++++++++++-
3 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 4245ebb2d7..a011d751cf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2371,6 +2371,7 @@ dist_patch_DATA =
\
%D%/packages/patches/zig-0.10.0-1638-re-add-qualCast.patch \
%D%/packages/patches/zig-0.11-use-system-paths.patch \
%D%/packages/patches/zig-0.12-use-baseline-cpu-by-default.patch \
+ %D%/packages/patches/zig-0.12-use-system-paths.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.12-use-system-paths.patch
b/gnu/packages/patches/zig-0.12-use-system-paths.patch
new file mode 100644
index 0000000000..c211c70610
--- /dev/null
+++ b/gnu/packages/patches/zig-0.12-use-system-paths.patch
@@ -0,0 +1,47 @@
+From 4f414609a811145af413bdf0ef2e3f022c00c0a1 Mon Sep 17 00:00:00 2001
+From: Hilton Chain <[email protected]>
+Date: Wed, 13 Nov 2024 12:54:43 +0800
+Subject: [PATCH] Use system paths.
+
+Add support for "CROSS_" environment variables, and set RUNPATH for directories
+in CROSS_LIBRARY_PATH (or LIBRARY_PATH).
+---
+ lib/std/zig/system/NativePaths.zig | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/std/zig/system/NativePaths.zig
b/lib/std/zig/system/NativePaths.zig
+index 2a50e27b0c..769dced516 100644
+--- a/lib/std/zig/system/NativePaths.zig
++++ b/lib/std/zig/system/NativePaths.zig
+@@ -144,24 +144,25 @@ pub fn detect(arena: Allocator, native_target:
std.Target) !NativePaths {
+ // variables to search for headers and libraries.
+ // We use os.getenv here since this part won't be executed on
+ // windows, to get rid of unnecessary error handling.
+- if (std.posix.getenv("C_INCLUDE_PATH")) |c_include_path| {
++ if (std.posix.getenv("CROSS_C_INCLUDE_PATH") orelse
std.posix.getenv("C_INCLUDE_PATH")) |c_include_path| {
+ var it = mem.tokenizeScalar(u8, c_include_path, ':');
+ while (it.next()) |dir| {
+ try self.addIncludeDir(dir);
+ }
+ }
+
+- if (std.posix.getenv("CPLUS_INCLUDE_PATH")) |cplus_include_path| {
++ if (std.posix.getenv("CROSS_CPLUS_INCLUDE_PATH") orelse
std.posix.getenv("CPLUS_INCLUDE_PATH")) |cplus_include_path| {
+ var it = mem.tokenizeScalar(u8, cplus_include_path, ':');
+ while (it.next()) |dir| {
+ try self.addIncludeDir(dir);
+ }
+ }
+
+- if (std.posix.getenv("LIBRARY_PATH")) |library_path| {
++ if (std.posix.getenv("CROSS_LIBRARY_PATH") orelse
std.posix.getenv("LIBRARY_PATH")) |library_path| {
+ var it = mem.tokenizeScalar(u8, library_path, ':');
+ while (it.next()) |dir| {
+ try self.addLibDir(dir);
++ try self.addRPath(dir);
+ }
+ }
+ }
+--
+2.46.0
+
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 058bf599d2..dd0f8c0a64 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -55,8 +55,10 @@
;; May be related: <https://github.com/ziglang/zig/issues/18434>.
(search-patches
(cond
- ((and (version>=? version "0.10.0-3660")
- (not (string=? version "0.10.1")))
+ ((version>=? version "0.11.0-3501")
+ "zig-0.12-use-system-paths.patch")
+ ((and (not (string=? version "0.10.1"))
+ (version>=? version "0.10.0-3660"))
"zig-0.11-use-system-paths.patch")
((version>=? version "0.10")
"zig-0.10-use-system-paths.patch")
@@ -1347,4 +1349,21 @@ toolchain. Among other features it provides
(modify-inputs (package-native-inputs base)
(replace "zig" `(,base "out")))))))
+(define zig-0.11.0-3501
+ (let ((commit "9b2345e182090e2f4c57e7684ec9739f195fdb1d")
+ (revision "3501")
+ (base zig-0.11.0-3344))
+ (package
+ (inherit base)
+ (name "zig")
+ (version (git-version "0.11.0" revision commit))
+ (source (zig-source
+ version commit
+ "0gwfnsjc3avx51cr5cwancms8s14hkrhqvk926cz3phgnn4jmpz0"))
+ ;; zig2
+ (arguments (package-arguments zig-0.11.0-3245))
+ (native-inputs
+ (modify-inputs (package-native-inputs base)
+ (replace "zig" `(,base "zig1")))))))
+
(define-public zig zig-0.10)
