guix-commits
[Top][All Lists]
Advanced

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

05/276: gnu: rust-rustix-0.37: Remove precompiled files.


From: guix-commits
Subject: 05/276: gnu: rust-rustix-0.37: Remove precompiled files.
Date: Wed, 18 Oct 2023 04:48:47 -0400 (EDT)

efraim pushed a commit to branch rust-team
in repository guix.

commit f5907db6eb4c17b6d6c92edd1e95a40aae831dc3
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sat Sep 30 23:47:43 2023 +0300

    gnu: rust-rustix-0.37: Remove precompiled files.
    
    * gnu/packages/crates-io.scm (rust-rustix-0.37)[source]: Add snippet to
    remove precompiled files and to not require them while building the
    package.
    (rust-rustix-0.36, rust-rustix-0.35): Inherit changes from
    rust-rustix-0.37.
---
 gnu/packages/crates-io.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9e8f66602c..8bc27c9eec 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56869,7 +56869,24 @@ rustc compiler.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c"))))
+                "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c"))
+              (snippet
+               #~(begin
+                   (use-modules (guix build utils))
+                   (for-each delete-file (find-files "." "\\.a$"))
+                   (delete-file "Cargo.toml")
+                   (substitute* "Cargo.toml.orig"
+                     ;; Depend unconditionally on the cc crate
+                     (("(cc = .*), optional = true.*" _ cc)
+                      (string-append cc " }\n"))
+                     ;; Disable using the linux_raw backend
+                     (("not\\(rustic_use_libc\\)") "miri"))
+                   (substitute* "build.rs"
+                     ;; Always use the 'feature = "cc"' path
+                     (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"")
+                     (("#\\[cfg\\(feature = \"cc\"\\)\\]" all)
+                      (string-append "//" all)))
+                   (copy-file "Cargo.toml.orig" "Cargo.toml")))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
@@ -56908,6 +56925,7 @@ rustc compiler.")
     (name "rust-rustix")
     (version "0.36.13")
     (source (origin
+              (inherit (package-source rust-rustix-0.37))
               (method url-fetch)
               (uri (crate-uri "rustix" version))
               (file-name (string-append name "-" version ".tar.gz"))
@@ -56945,6 +56963,7 @@ rustc compiler.")
     (name "rust-rustix")
     (version "0.35.13")
     (source (origin
+              (inherit (package-source rust-rustix-0.36))
               (method url-fetch)
               (uri (crate-uri "rustix" version))
               (file-name (string-append name "-" version ".tar.gz"))



reply via email to

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