[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
469/470: gnu: rust-gmp-mpfr-sys-1: Remove bundled libraries.
From: |
guix-commits |
Subject: |
469/470: gnu: rust-gmp-mpfr-sys-1: Remove bundled libraries. |
Date: |
Sun, 30 Apr 2023 14:05:31 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 34317ef47e352f5f39a53c727d246f2dd28f236d
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 25 14:49:35 2023 +0300
gnu: rust-gmp-mpfr-sys-1: Remove bundled libraries.
* gnu/packages/crates-io.scm (rust-gmp-mpfr-sys-1)[source]: Add snippet
to remove bundled libraries and build without them.
[arguments]: Remove custom phase to help build bundled libraries.
[native-inputs]: Remove bash-minimal, m4.
[inputs]: Add gmp, mpc, mpfr.
(rust-rug-1)[arguments]: Remove custom phase to help build bundled
libraries.
[native-inputs]: Remove bash-minimal, m4.
[inputs]: Add gmp, mpc, mpfr.
---
gnu/packages/crates-io.scm | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 641c341f11..f3f92f29ea 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -77,7 +77,6 @@
#:use-module (gnu packages jemalloc)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
- #:use-module (gnu packages m4)
#:use-module (gnu packages mail)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages nettle)
@@ -25787,19 +25786,26 @@ timers.")
(uri (crate-uri "gmp-mpfr-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1ysvdf352vcnb5ygmbwf5pkndqb0p6clmz0nqkf3nmz9ghssfim1"))))
+ (base32 "1ysvdf352vcnb5ygmbwf5pkndqb0p6clmz0nqkf3nmz9ghssfim1"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "gmp-6.2.1-c")
+ (delete-file-recursively "mpc-1.2.1-c")
+ (delete-file-recursively "mpfr-4.1.0-p13-c")
+ (substitute* "Cargo.toml"
+ ;; Default to using system libraries.
+ (("^default.*") "default = [\"use-system-libs\"]\n")
+ ;; Also use the system library for each of the libraries.
+ (("^mpc.*") "mpc = [\"use-system-libs\"]\n")
+ (("^mpfr.*") "mpfr = [\"use-system-libs\"]\n"))))))
(build-system cargo-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'set-shell-for-configure-script
- (lambda _
- (setenv "CONFIG_SHELL" (which "sh")))))
- #:cargo-inputs
- (("rust-libc" ,rust-libc-0.2)
- ("rust-winapi" ,rust-winapi-0.3))))
- (native-inputs
- (list bash-minimal m4))
+ `(#:cargo-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))))
+ (inputs
+ (list gmp mpc mpfr))
(home-page "https://gitlab.com/tspiteri/gmp-mpfr-sys")
(synopsis "Rust FFI bindings for GMP, MPFR, and MPC")
(description "This package provides Rust FFI bindings for the numeric
@@ -51088,12 +51094,7 @@ scenario you want to test.")
(base32 "1iw52gyw0hshymqa04g76m7qnrds5vkgc5s8svqx5nv1jz1wrdgm"))))
(build-system cargo-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'set-shell-for-configure-script
- (lambda _
- (setenv "CONFIG_SHELL" (which "sh")))))
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-az" ,rust-az-1)
("rust-gmp-mpfr-sys" ,rust-gmp-mpfr-sys-1)
("rust-libc" ,rust-libc-0.2)
@@ -51103,8 +51104,8 @@ scenario you want to test.")
("rust-byteorder" ,rust-byteorder-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-serde-test" ,rust-serde-test-1))))
- (native-inputs
- (list bash-minimal m4))
+ (inputs
+ (list gmp mpc mpfr))
(home-page "https://gitlab.com/tspiteri/rug")
(synopsis
"Arbitrary-precision integers, rational, floating-point and complex
numbers")
- 426/470: gnu: Add rust-glutin-egl-sys-0.4., (continued)
- 426/470: gnu: Add rust-glutin-egl-sys-0.4., guix-commits, 2023/04/30
- 431/470: gnu: Add rust-redox-syscall-0.3., guix-commits, 2023/04/30
- 443/470: gnu: rust-ab-glyph-rasterizer-0.1: Update to 0.1.8., guix-commits, 2023/04/30
- 441/470: gnu: Add rust-owned-ttf-parser-0.19., guix-commits, 2023/04/30
- 442/470: gnu: Add rust-ab-glyph-0.2., guix-commits, 2023/04/30
- 447/470: gnu: Add rust-tiny-skia-0.8., guix-commits, 2023/04/30
- 450/470: gnu: rust-bindgen-0.59: Add missing inputs., guix-commits, 2023/04/30
- 462/470: gnu: rust-tokio-rustls-0.23: Add missing input., guix-commits, 2023/04/30
- 463/470: gnu: rust-ct-logs-0.8: Add missing input., guix-commits, 2023/04/30
- 466/470: gnu: rust-webpki-0.18: Fix build., guix-commits, 2023/04/30
- 469/470: gnu: rust-gmp-mpfr-sys-1: Remove bundled libraries.,
guix-commits <=
- 297/470: gnu: rust-1.55: Remove bundled libraries., guix-commits, 2023/04/30
- 217/470: gnu: rust-wasm-bindgen-macro-0.2: Update to 0.2.84., guix-commits, 2023/04/30
- 170/470: gnu: Remove rust-parity-wasm-0.40., guix-commits, 2023/04/30
- 204/470: gnu: Add rust-libdeflater-0.11., guix-commits, 2023/04/30
- 216/470: gnu: rust-wasm-bindgen-futures-0.4: Update to 0.4.34., guix-commits, 2023/04/30
- 233/470: gnu: Remove rust-cargon-0.0., guix-commits, 2023/04/30
- 228/470: gnu: Remove rust-lexical-5., guix-commits, 2023/04/30
- 299/470: gnu: rust: Remove more bundled sources., guix-commits, 2023/04/30
- 302/470: gnu: agate: Add missing input., guix-commits, 2023/04/30
- 305/470: gnu: rbw: Add missing input., guix-commits, 2023/04/30