guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/17: gnu: zig: Remove unneeded librt patch.


From: guix-commits
Subject: 02/17: gnu: zig: Remove unneeded librt patch.
Date: Thu, 18 Jan 2024 07:58:10 -0500 (EST)

jpoiret pushed a commit to branch core-updates
in repository guix.

commit 4bd1ca8f0ededbe09d4be27c11e52583f1f44580
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Thu Dec 28 17:04:31 2023 +0100

    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
---
 gnu/local.mk                                             |  1 -
 gnu/packages/patches/zig-do-not-link-against-librt.patch | 10 ----------
 gnu/packages/zig.scm                                     |  6 ++----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 59899a71f3..b63fe38d6c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2224,7 +2224,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 c9c3ddca62..3cbfdd66fa 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -44,8 +44,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
@@ -147,8 +146,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 ''())



reply via email to

[Prev in Thread] Current Thread [Next in Thread]