hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 3d7aad79394804f129b07254a0aa6cb1a4136014
Author: Hilton Chain <[email protected]>
AuthorDate: Wed Nov 13 21:29:54 2024 +0800
gnu: zig-0.9: Update patches.
Use upstream version of system-paths patch, additionally support "CROSS_"
environment variables.
* gnu/packages/patches/zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch: New file.
* gnu/packages/patches/zig-0.9-fix-runpath.patch: New file.
* gnu/packages/patches/zig-use-baseline-cpu-by-default.patch: Rename to...
* gnu/packages/patches/zig-0.9-use-baseline-cpu-by-default.patch: ...this.
* gnu/packages/patches/zig-use-system-paths.patch: Rename to...
* gnu/packages/patches/zig-0.9-use-system-paths.patch: ...this and update.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/zig.scm (zig-0.9)[source]: Use zig-source.
Add patches.
(zig-0.10)[source]<patches>: Adjust patch name.
Change-Id: I9c9dec911e00a797a959b83ab214c129743173fd
---
gnu/local.mk | 6 +-
.../zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch | 35 +++++
gnu/packages/patches/zig-0.9-fix-runpath.patch | 29 ++++
...h => zig-0.9-use-baseline-cpu-by-default.patch} | 0
.../patches/zig-0.9-use-system-paths.patch | 91 +++++++++++++
gnu/packages/patches/zig-use-system-paths.patch | 148 ---------------------
gnu/packages/zig.scm | 21 +--
7 files changed, 170 insertions(+), 160 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ff6c6be5f0..1895724f89 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2367,9 +2367,11 @@ dist_patch_DATA =
\
%D%/packages/patches/xygrib-fix-finding-data.patch \
%D%/packages/patches/xygrib-newer-proj.patch \
%D%/packages/patches/yggdrasil-extra-config.patch \
+ %D%/packages/patches/zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch \
+ %D%/packages/patches/zig-0.9-fix-runpath.patch \
%D%/packages/patches/zig-0.9-riscv-support.patch \
- %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \
- %D%/packages/patches/zig-use-system-paths.patch \
+ %D%/packages/patches/zig-0.9-use-baseline-cpu-by-default.patch \
+ %D%/packages/patches/zig-0.9-use-system-paths.patch \
%D%/packages/patches/zsh-egrep-failing-test.patch \
%D%/packages/patches/zuo-bin-sh.patch
diff --git a/gnu/packages/patches/zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch
b/gnu/packages/patches/zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch
new file mode 100644
index 0000000000..ea91037590
--- /dev/null
+++ b/gnu/packages/patches/zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch
@@ -0,0 +1,35 @@
+From 0534b4d9dc66212de1610e049ac7c740eeac195d Mon Sep 17 00:00:00 2001
+From: Hilton Chain <[email protected]>
+Date: Sun, 17 Nov 2024 10:04:53 +0800
+Subject: [PATCH 2/5] Add GUIX_ZIG_GLIBC_LINKER.
+
+---
+ lib/std/zig/system/NativeTargetInfo.zig | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/std/zig/system/NativeTargetInfo.zig
b/lib/std/zig/system/NativeTargetInfo.zig
+index af41fc7905..c48d08852a 100644
+--- a/lib/std/zig/system/NativeTargetInfo.zig
++++ b/lib/std/zig/system/NativeTargetInfo.zig
+@@ -782,10 +782,17 @@ fn defaultAbiAndDynamicLinker(cpu: Target.Cpu, os:
Target.Os, cross_target: Cros
+ .os = os,
+ .abi = cross_target.abi orelse Target.Abi.default(cpu.arch, os),
+ };
++ var standard_linker = target.standardDynamicLinkerPath();
++ const getenv_available = !(builtin.os.tag == .windows or (builtin.os.tag
== .wasi and !builtin.link_libc));
++ if (getenv_available) {
++ const guix_zig_glibc_linker = std.os.getenv("GUIX_ZIG_GLIBC_LINKER");
++ if (guix_zig_glibc_linker != null)
++ standard_linker.set(guix_zig_glibc_linker);
++ }
+ return NativeTargetInfo{
+ .target = target,
+ .dynamic_linker = if (cross_target.dynamic_linker.get() == null)
+- target.standardDynamicLinkerPath()
++ standard_linker
+ else
+ cross_target.dynamic_linker,
+ };
+--
+2.46.0
+
diff --git a/gnu/packages/patches/zig-0.9-fix-runpath.patch
b/gnu/packages/patches/zig-0.9-fix-runpath.patch
new file mode 100644
index 0000000000..868363ea8a
--- /dev/null
+++ b/gnu/packages/patches/zig-0.9-fix-runpath.patch
@@ -0,0 +1,29 @@
+From 388c0e23fb50dec7a98ab9468dff83dedb4673ae Mon Sep 17 00:00:00 2001
+From: Hilton Chain <[email protected]>
+Date: Thu, 14 Nov 2024 14:23:58 +0800
+Subject: [PATCH 3/5] Fix RUNPATH issue.
+
+Add needed libraries and libc to RUNPATH when CROSS_LIBRARY_PATH or
LIBRARY_PATH
+is set.
+---
+ src/Compilation.zig | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Compilation.zig b/src/Compilation.zig
+index b44c7da78d..cb100434d0 100644
+--- a/src/Compilation.zig
++++ b/src/Compilation.zig
+@@ -1515,7 +1515,9 @@ pub fn create(gpa: Allocator, options: InitOptions)
!*Compilation {
+ .llvm_cpu_features = llvm_cpu_features,
+ .skip_linker_dependencies = options.skip_linker_dependencies,
+ .parent_compilation_link_libc =
options.parent_compilation_link_libc,
+- .each_lib_rpath = options.each_lib_rpath orelse
options.is_native_os,
++ .each_lib_rpath = std.process.hasEnvVar(gpa,
"CROSS_LIBRARY_PATH") catch false or
++ std.process.hasEnvVar(gpa, "LIBRARY_PATH") catch false or
++ options.each_lib_rpath orelse false,
+ .disable_lld_caching = options.disable_lld_caching,
+ .subsystem = options.subsystem,
+ .is_test = options.is_test,
+--
+2.46.0
+
diff --git a/gnu/packages/patches/zig-use-baseline-cpu-by-default.patch
b/gnu/packages/patches/zig-0.9-use-baseline-cpu-by-default.patch
similarity index 100%
rename from gnu/packages/patches/zig-use-baseline-cpu-by-default.patch
rename to gnu/packages/patches/zig-0.9-use-baseline-cpu-by-default.patch
diff --git a/gnu/packages/patches/zig-0.9-use-system-paths.patch
b/gnu/packages/patches/zig-0.9-use-system-paths.patch
new file mode 100644
index 0000000000..84370538e5
--- /dev/null
+++ b/gnu/packages/patches/zig-0.9-use-system-paths.patch
@@ -0,0 +1,91 @@
+From 9a52d59077be9a9e645cf59d9189c17486893535 Mon Sep 17 00:00:00 2001
+From: Hilton Chain <[email protected]>
+Date: Wed, 13 Nov 2024 12:46:31 +0800
+Subject: [PATCH] Use system paths.
+
+Prefer Guix search paths and support Guix cross builds.
+---
+ lib/std/zig/system/NativePaths.zig | 52 ++++++++++++++++++++++++++++++
+ src/main.zig | 3 +-
+ 2 files changed, 54 insertions(+), 1 deletion(-)
+
+diff --git a/lib/std/zig/system/NativePaths.zig
b/lib/std/zig/system/NativePaths.zig
+index 8e3e46e481..05a5858a8d 100644
+--- a/lib/std/zig/system/NativePaths.zig
++++ b/lib/std/zig/system/NativePaths.zig
+@@ -25,6 +25,58 @@ pub fn detect(allocator: Allocator, native_info:
NativeTargetInfo) !NativePaths
+ .warnings = ArrayList([:0]u8).init(allocator),
+ };
+ errdefer self.deinit();
++ const getenv_available = !(builtin.os.tag == .windows or (builtin.os.tag
== .wasi and !builtin.link_libc));
++ var is_guix = false;
++ var is_cross_guix = false;
++ if (getenv_available) {
++ if (std.os.getenv("CROSS_C_INCLUDE_PATH")) |c_include_path| {
++ is_cross_guix = true;
++ var it = mem.tokenize(u8, c_include_path, ":");
++ while (it.next()) |dir| {
++ try self.addIncludeDir(dir);
++ }
++ }
++ if (std.os.getenv("CROSS_CPLUS_INCLUDE_PATH")) |cplus_include_path| {
++ is_cross_guix = true;
++ var it = mem.tokenize(u8, cplus_include_path, ":");
++ while (it.next()) |dir| {
++ try self.addIncludeDir(dir);
++ }
++ }
++ if (std.os.getenv("CROSS_LIBRARY_PATH")) |library_path| {
++ is_cross_guix = true;
++ var it = mem.tokenize(u8, library_path, ":");
++ while (it.next()) |dir| {
++ try self.addLibDir(dir);
++ }
++ }
++ if (!is_cross_guix) {
++ if (std.os.getenv("C_INCLUDE_PATH")) |c_include_path| {
++ is_guix = true;
++ var it = mem.tokenize(u8, c_include_path, ":");
++ while (it.next()) |dir| {
++ try self.addIncludeDir(dir);
++ }
++ }
++ if (std.os.getenv("CPLUS_INCLUDE_PATH")) |cplus_include_path| {
++ is_guix = true;
++ var it = mem.tokenize(u8, cplus_include_path, ":");
++ while (it.next()) |dir| {
++ try self.addIncludeDir(dir);
++ }
++ }
++ if (std.os.getenv("LIBRARY_PATH")) |library_path| {
++ is_guix = true;
++ var it = mem.tokenize(u8, library_path, ":");
++ while (it.next()) |dir| {
++ try self.addLibDir(dir);
++ }
++ }
++ }
++ }
++ if (is_guix or is_cross_guix) {
++ return self;
++ }
+
+ var is_nix = false;
+ if (process.getEnvVarOwned(allocator, "NIX_CFLAGS_COMPILE"))
|nix_cflags_compile| {
+diff --git a/src/main.zig b/src/main.zig
+index 42daa95d3a..9a1b0d3e3d 100644
+--- a/src/main.zig
++++ b/src/main.zig
+@@ -2039,7 +2039,8 @@ fn buildOutputType(
+ want_native_include_dirs = true;
+ }
+
+- if (sysroot == null and cross_target.isNativeOs() and
(system_libs.count() != 0 or want_native_include_dirs)) {
++ if (process.hasEnvVar(arena, "CROSS_LIBRARY_PATH") catch false or
++ sysroot == null and cross_target.isNativeOs() and
(system_libs.count() != 0 or want_native_include_dirs)) {
+ const paths = std.zig.system.NativePaths.detect(arena, target_info)
catch |err| {
+ fatal("unable to detect native system paths: {s}",
.{@errorName(err)});
+ };
+--
+2.46.0
+
diff --git a/gnu/packages/patches/zig-use-system-paths.patch
b/gnu/packages/patches/zig-use-system-paths.patch
deleted file mode 100644
index a008beafc2..0000000000
--- a/gnu/packages/patches/zig-use-system-paths.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-This patch replaces the OS-specific detection mechanism by one that solely
-relies on environment variables. This has the benefit that said environment
-variables can be used as search paths in Guix.
-
-diff --git a/lib/std/zig/system/NativePaths.zig
b/lib/std/zig/system/NativePaths.zig
-index 8e3e46e48..1ed9d3206 100644
---- a/lib/std/zig/system/NativePaths.zig
-+++ b/lib/std/zig/system/NativePaths.zig
-@@ -26,73 +26,42 @@ pub fn detect(allocator: Allocator, native_info:
NativeTargetInfo) !NativePaths
- };
- errdefer self.deinit();
-
-- var is_nix = false;
-- if (process.getEnvVarOwned(allocator, "NIX_CFLAGS_COMPILE"))
|nix_cflags_compile| {
-- defer allocator.free(nix_cflags_compile);
--
-- is_nix = true;
-- var it = mem.tokenize(u8, nix_cflags_compile, " ");
-+ // TODO: Support cross-compile paths?
-+ if (process.getEnvVarOwned(allocator, "C_INCLUDE_PATH")) |c_include_path|
{
-+ defer allocator.free(c_include_path);
-+ var it = mem.tokenize(u8, c_include_path, ":");
- while (true) {
-- const word = it.next() orelse break;
-- if (mem.eql(u8, word, "-isystem")) {
-- const include_path = it.next() orelse {
-- try self.addWarning("Expected argument after -isystem in
NIX_CFLAGS_COMPILE");
-- break;
-- };
-- try self.addIncludeDir(include_path);
-- } else {
-- if (mem.startsWith(u8, word, "-frandom-seed=")) {
-- continue;
-- }
-- try self.addWarningFmt("Unrecognized C flag from
NIX_CFLAGS_COMPILE: {s}", .{word});
-- }
-+ const dir = it.next() orelse break;
-+ try self.addIncludeDir(dir);
- }
- } else |err| switch (err) {
- error.InvalidUtf8 => {},
- error.EnvironmentVariableNotFound => {},
- error.OutOfMemory => |e| return e,
- }
-- if (process.getEnvVarOwned(allocator, "NIX_LDFLAGS")) |nix_ldflags| {
-- defer allocator.free(nix_ldflags);
--
-- is_nix = true;
-- var it = mem.tokenize(u8, nix_ldflags, " ");
-+ if (process.getEnvVarOwned(allocator, "CPLUS_INCLUDE_PATH"))
|cplus_include_path| {
-+ defer allocator.free(cplus_include_path);
-+ var it = mem.tokenize(u8, cplus_include_path, ":");
- while (true) {
-- const word = it.next() orelse break;
-- if (mem.eql(u8, word, "-rpath")) {
-- const rpath = it.next() orelse {
-- try self.addWarning("Expected argument after -rpath in
NIX_LDFLAGS");
-- break;
-- };
-- try self.addRPath(rpath);
-- } else if (word.len > 2 and word[0] == '-' and word[1] == 'L') {
-- const lib_path = word[2..];
-- try self.addLibDir(lib_path);
-- } else {
-- try self.addWarningFmt("Unrecognized C flag from NIX_LDFLAGS:
{s}", .{word});
-- break;
-- }
-+ const dir = it.next() orelse break;
-+ try self.addIncludeDir(dir);
- }
- } else |err| switch (err) {
- error.InvalidUtf8 => {},
- error.EnvironmentVariableNotFound => {},
- error.OutOfMemory => |e| return e,
- }
-- if (is_nix) {
-- return self;
-- }
--
-- if (comptime builtin.target.isDarwin()) {
-- try self.addIncludeDir("/usr/include");
-- try self.addIncludeDir("/usr/local/include");
--
-- try self.addLibDir("/usr/lib");
-- try self.addLibDir("/usr/local/lib");
--
-- try self.addFrameworkDir("/Library/Frameworks");
-- try self.addFrameworkDir("/System/Library/Frameworks");
--
-- return self;
-+ if (process.getEnvVarOwned(allocator, "LIBRARY_PATH")) |library_path| {
-+ defer allocator.free(library_path);
-+ var it = mem.tokenize(u8, library_path, ":");
-+ while (true) {
-+ const dir = it.next() orelse break;
-+ try self.addLibDir(dir);
-+ }
-+ } else |err| switch (err) {
-+ error.InvalidUtf8 => {},
-+ error.EnvironmentVariableNotFound => {},
-+ error.OutOfMemory => |e| return e,
- }
-
- if (comptime native_target.os.tag == .solaris) {
-@@ -106,32 +75,17 @@ pub fn detect(allocator: Allocator, native_info:
NativeTargetInfo) !NativePaths
- return self;
- }
-
-- if (native_target.os.tag != .windows) {
-- const triple = try native_target.linuxTriple(allocator);
-- const qual = native_target.cpu.arch.ptrBitWidth();
--
-- // TODO: $ ld --verbose | grep SEARCH_DIR
-- // the output contains some paths that end with lib64, maybe include
them too?
-- // TODO: what is the best possible order of things?
-- // TODO: some of these are suspect and should only be added on some
systems. audit needed.
--
-- try self.addIncludeDir("/usr/local/include");
-- try self.addLibDirFmt("/usr/local/lib{d}", .{qual});
-- try self.addLibDir("/usr/local/lib");
--
-- try self.addIncludeDirFmt("/usr/include/{s}", .{triple});
-- try self.addLibDirFmt("/usr/lib/{s}", .{triple});
--
-- try self.addIncludeDir("/usr/include");
-- try self.addLibDirFmt("/lib{d}", .{qual});
-- try self.addLibDir("/lib");
-- try self.addLibDirFmt("/usr/lib{d}", .{qual});
-- try self.addLibDir("/usr/lib");
--
-- // example: on a 64-bit debian-based linux distro, with zlib
installed from apt:
-- // zlib.h is in /usr/include (added above)
-- // libz.so.1 is in /lib/x86_64-linux-gnu (added here)
-- try self.addLibDirFmt("/lib/{s}", .{triple});
-+ if (process.getEnvVarOwned(allocator, "DYLD_FRAMEWORK_PATH"))
|dyld_framework_path| {
-+ defer allocator.free(dyld_framework_path);
-+ var it = mem.tokenize(u8, dyld_framework_path, ":");
-+ while (true) {
-+ const dir = it.next() orelse break;
-+ try self.addFrameworkDir(dir);
-+ }
-+ } else |err| switch (err) {
-+ error.InvalidUtf8 => {},
-+ error.EnvironmentVariableNotFound => {},
-+ error.OutOfMemory => |e| return e,
- }
-
- return self;
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index bae66a4692..c71e8cb92c 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -52,15 +52,16 @@
(version "0.9.1")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ziglang/zig.git";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7"))
- (patches (search-patches "zig-0.9-riscv-support.patch"
- "zig-use-system-paths.patch"))))
+ (inherit (zig-source
+ version version
+ "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7"))
+ (patches
+ (search-patches
+ "zig-0.9-add-GUIX_ZIG_GLIBC_LINKER.patch"
+ "zig-0.9-fix-runpath.patch"
+ "zig-0.9-riscv-support.patch"
+ "zig-0.9-use-baseline-cpu-by-default.patch"
+ "zig-0.9-use-system-paths.patch"))))
(build-system cmake-build-system)
(arguments
(list
@@ -162,7 +163,7 @@ toolchain. Among other features it provides
(file-name (git-file-name name version))
(sha256
(base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b"))
- (patches (search-patches "zig-use-baseline-cpu-by-default.patch"))))
+ (patches (search-patches "zig-0.9-use-baseline-cpu-by-default.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments zig-0.9)
((#:configure-flags flags ''())
