From 82649c6cd7ee0a73c51213d19db1d05370df1f7f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 17 Feb 2023 10:33:05 +0200 Subject: 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(-) (limited to 'gnu/packages/rust.scm') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9af4ae2703..836afa93a9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017, 2018 Nikolai Merinov -;;; Copyright © 2017, 2019-2022 Efraim Flashner +;;; Copyright © 2017, 2019-2023 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2019 Ivan Petkov @@ -162,7 +162,11 @@ (define rust-bootstrap (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")) @@ -368,6 +372,10 @@ (define rust-1.55 (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) -- cgit v1.2.3