guix-commits
[Top][All Lists]
Advanced

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

01/470: gnu: rust: Remove bundled compiled libraries.


From: guix-commits
Subject: 01/470: gnu: rust: Remove bundled compiled libraries.
Date: Thu, 16 Mar 2023 02:59:40 -0400 (EDT)

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

commit d6b698c82ef7447b15a113256e2774c3a852839c
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Feb 17 10:33:05 2023 +0200

    gnu: rust: Remove bundled compiled libraries.
    
    * gnu/packages/rust.scm (rust-bootstrap)[source]: Adjust snippet to also
    remove bundled pre-compiled shared libraries.
    (rust-1.55): Same.
---
 gnu/packages/rust.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 133c46fb7c..f0ce3ef0d2 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2016 Nikita <nikita@n0.is>
 ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2017, 2018 Nikolai Merinov <nikolai.merinov@member.fsf.org>
-;;; Copyright © 2017, 2019-2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
@@ -162,7 +162,11 @@
        (snippet
         '(begin
            (for-each delete-file-recursively
-                     '("src/llvm-project"))))
+                     '("src/llvm-project"))
+           ;; Remove vendored dynamically linked libraries.
+           ;; find . -not -type d -executable -exec file {} \+ | grep ELF
+           (delete-file "vendor/vte/vim10m_match")
+           (delete-file "vendor/vte/vim10m_table")))
        (patches (search-patches "rustc-1.54.0-src.patch"))
        (patch-flags '("-p0"))))         ;default is -p1
     (outputs '("out" "cargo"))
@@ -374,6 +378,10 @@ safety and thread safety guarantees.")
            (for-each delete-file-recursively
                      '("src/llvm-project"
                        "vendor/tikv-jemalloc-sys/jemalloc"))
+           ;; Remove vendored dynamically linked libraries.
+           ;; find . -not -type d -executable -exec file {} \+ | grep ELF
+           (delete-file "vendor/vte/vim10m_match")
+           (delete-file "vendor/vte/vim10m_table")
            ;; Add support for riscv64-linux.
            (substitute* "vendor/tikv-jemallocator/src/lib.rs"
              (("    target_arch = \"s390x\"," all)



reply via email to

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