bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-27 19:35:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: zig-0.14: Fix library search for ‘-Wl,-rpath=’ pkg-config flag.

Browse source 
This is a follow-up to commit 8b809c3311, where
I removed handling of ‘-Wl,-rpath=’ pkg-config flag from the patch and this
broke build of ncdu.

* gnu/packages/patches/zig-0.14-fix-runpath.patch: Add back handling of
‘-Wl,-rpath=’ pkg-config flag.

Change-Id: Ifdd6885d376ed39d6702431055f77bdae5ae6439
This commit is contained in:
Hilton Chain 2025-05-25 20:19:49 +08:00
parent fa48957a40
commit 19af5b3845
No known key found for this signature in database
GPG key ID: ACC66D09CA528292
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/patches/zig-0.14-fix-runpath.patch
View file

@ -1,4 +1,4 @@
From 467261b7e31dbb56aa06318bdd2e7260a80b313a Mon Sep 17 00:00:00 2001
From c531a68b2dc5d96a50c1783d5f266e8c5b9c456e Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Fri, 29 Nov 2024 14:13:46 +0800
Subject: [PATCH] Fix RUNPATH issue.
@ -6,10 +6,24 @@ Subject: [PATCH] Fix RUNPATH issue.
Add needed libraries and libc to RUNPATH when CROSS_LIBRARY_PATH or LIBRARY_PATH
is set.
---
src/link/Elf.zig | 14 ++++++++++++++
src/main.zig | 34 +++++++++++++++++++++++++++++++++-
2 files changed, 47 insertions(+), 1 deletion(-)
lib/std/Build/Step/Compile.zig | 2 ++
src/link/Elf.zig | 14 ++++++++++++++
src/main.zig | 34 +++++++++++++++++++++++++++++++++-
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig
index c401a840ba..44ced5823f 100644
--- a/lib/std/Build/Step/Compile.zig
+++ b/lib/std/Build/Step/Compile.zig
@@ -787,6 +787,8 @@ fn runPkgConfig(compile: *Compile, lib_name: []const u8) !PkgConfigResult {
try zig_cflags.append(arg);
} else if (mem.startsWith(u8, arg, wl_rpath_prefix)) {
try zig_cflags.appendSlice(&[_][]const u8{ "-rpath", arg[wl_rpath_prefix.len..] });
+ } else if (mem.startsWith(u8, arg, "-Wl,-rpath=")) {
+ try zig_libs.appendSlice(&[_][]const u8{ "-L", arg["-Wl,-rpath=".len..] });
} else if (b.debug_pkg_config) {
return compile.step.fail("unknown pkg-config flag '{s}'", .{arg});
}
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 591786cfbc..253c7f6732 100644
--- a/src/link/Elf.zig