ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-08 04:14:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: rust: Unbundle openssl.

Browse source 
* gnu/packages/rust.scm (rust-bootstrap)[source]: In snippet also remove
bundled openssl, jemalloc.
(rust-1.55, rust-1.61, rust-1.69, rust-1.72, rust-1.73, rust-1.74)
[source]: In snippet also remove bundled openssl.

Change-Id: I6da91820942c36be17f106b426b82d8e068b751c
This commit is contained in:
Efraim Flashner 2024-01-12 12:52:06 +02:00
parent e825a656eb
commit 8a6ad1b32d
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/rust.scm
View file

@ -160,7 +160,9 @@ (define-public rust-bootstrap
(snippet (snippet
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project")) '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
(delete-file "vendor/vte/vim10m_match") (delete-file "vendor/vte/vim10m_match")
@ -168,7 +170,7 @@ (define-public rust-bootstrap
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
;; find vendor -not -type d -exec file {} \+ | grep PE32 ;; find vendor -not -type d -exec file {} \+ | grep PE32
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$")))) (find-files "vendor" "\\.(a|dll|exe|lib)$"))))
(patches (search-patches "rustc-1.54.0-src.patch")) (patches (search-patches "rustc-1.54.0-src.patch"))
(patch-flags '("-p0")))) ;default is -p1 (patch-flags '("-p0")))) ;default is -p1
(outputs '("out" "cargo")) (outputs '("out" "cargo"))
@ -365,6 +367,7 @@ (define-public rust-1.55
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -373,7 +376,7 @@ (define-public rust-1.55
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
;; find vendor -not -type d -exec file {} \+ | grep PE32 ;; find vendor -not -type d -exec file {} \+ | grep PE32
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$")) (find-files "vendor" "\\.(a|dll|exe|lib)$"))
;; Add support for riscv64-linux. ;; Add support for riscv64-linux.
(substitute* "vendor/tikv-jemallocator/src/lib.rs" (substitute* "vendor/tikv-jemallocator/src/lib.rs"
((" target_arch = \"s390x\"," all) ((" target_arch = \"s390x\"," all)
@ -609,6 +612,7 @@ (define-public rust-1.61
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -616,7 +620,7 @@ (define-public rust-1.61
(delete-file "vendor/vte/vim10m_table") (delete-file "vendor/vte/vim10m_table")
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file (for-each delete-file
(find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) (find-files "vendor" "\\.(a|dll|exe|lib)$")))))))))
(define-public rust-1.62 (define-public rust-1.62
(rust-bootstrapped-package (rust-bootstrapped-package
@ -693,6 +697,7 @@ (define-public rust-1.69
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Also remove the bundled (mostly Windows) libraries. ;; Also remove the bundled (mostly Windows) libraries.
(for-each delete-file (for-each delete-file
@ -747,6 +752,7 @@ (define-public rust-1.72
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -771,6 +777,7 @@ (define-public rust-1.73
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF
@ -794,6 +801,7 @@ (define rust-1.74
'(begin '(begin
(for-each delete-file-recursively (for-each delete-file-recursively
'("src/llvm-project" '("src/llvm-project"
"vendor/openssl-src/openssl"
"vendor/tikv-jemalloc-sys/jemalloc")) "vendor/tikv-jemalloc-sys/jemalloc"))
;; Remove vendored dynamically linked libraries. ;; Remove vendored dynamically linked libraries.
;; find . -not -type d -executable -exec file {} \+ | grep ELF ;; find . -not -type d -executable -exec file {} \+ | grep ELF