summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorJosselin Poiret <dev@jpoiret.xyz>2023-12-28 17:04:31 +0100
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:25 +0200
commit828daf0ab04a12695ff14ad6bad4b23533702215 (patch)
treecda63f2eba54eac556871639d91e989ffe866d16 /gnu
parente87060ff6de07e6d8cda3f3b2e5fe0981789f9b9 (diff)
downloadguix-828daf0ab04a12695ff14ad6bad4b23533702215.tar.gz
gnu: zig: Remove unneeded librt patch.
* gnu/packages/patches/zig-do-not-link-against-librt.patch: Delete patch.
* gnu/local.mk (dist_patch_DATA): Unregister.
* gnu/packages/zig.scm (zig-0.9, zig-0.10): Remove patch.

Change-Id: Ifc6c811671827aeb8ae4c191020ef724847abebe
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/zig-do-not-link-against-librt.patch10
-rw-r--r--gnu/packages/zig.scm6
3 files changed, 2 insertions, 15 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 916ac62220..71113d610e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2301,7 +2301,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/xygrib-newer-proj.patch			\
   %D%/packages/patches/yggdrasil-extra-config.patch	\
   %D%/packages/patches/zig-0.9-riscv-support.patch		\
-  %D%/packages/patches/zig-do-not-link-against-librt.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-do-not-link-against-librt.patch b/gnu/packages/patches/zig-do-not-link-against-librt.patch
deleted file mode 100644
index 3239efbdd4..0000000000
--- a/gnu/packages/patches/zig-do-not-link-against-librt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/target.zig	2023-04-22 11:44:47.917416658 +0200
-+++ b/src/target.zig	2023-04-22 11:45:04.577465352 +0200
-@@ -478,7 +478,6 @@
-                 "-lpthread",
-                 "-lc",
-                 "-ldl",
--                "-lrt",
-                 "-lutil",
-             },
-         },
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index 6e399dfce3..6994d48818 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -45,8 +45,7 @@
        (sha256
         (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7"))
        (patches (search-patches "zig-0.9-riscv-support.patch"
-                                "zig-use-system-paths.patch"
-                                "zig-do-not-link-against-librt.patch"))))
+                                "zig-use-system-paths.patch"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -148,8 +147,7 @@ toolchain.  Among other features it provides
        (file-name (git-file-name name version))
        (sha256
         (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b"))
-       (patches (search-patches "zig-do-not-link-against-librt.patch"
-                                "zig-use-baseline-cpu-by-default.patch"))))
+       (patches (search-patches "zig-use-baseline-cpu-by-default.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments zig-0.9)
        ((#:configure-flags flags ''())