[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
41/45: build-system/cargo: Set openssl environment variable when availab
|
From: |
guix-commits |
|
Subject: |
41/45: build-system/cargo: Set openssl environment variable when available. |
|
Date: |
Sun, 22 Nov 2020 12:49:49 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 3dbf3a7f516cb5576ce77d9545cfa56b741f279b
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Nov 22 18:09:39 2020 +0200
build-system/cargo: Set openssl environment variable when available.
* guix/build/cargo-build-system.scm (configure): When openssl is
available set the OPENSSL_DIR variable to discover its location.
* gnu/packages/crates-io.scm (rust-curl-sys-0.4, rust-libgit2-sys-0.10,
rust-libpijul-0.12, rust-libssh2-sys-0.2, rust-native-tls-0.2,
rust-openssl-sys-0.9, rust-openssl-0.7, rust-trust-dns-rustls-0.6),
* gnu/packages/rust-apps.scm (tokei, exa)[arguments]: Remove redundant
setenv for openssl.
---
gnu/packages/crates-io.scm | 94 +++++++++++----------------------------
gnu/packages/rust-apps.scm | 18 ++------
guix/build/cargo-build-system.scm | 2 +
3 files changed, 30 insertions(+), 84 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7dcbdf7..88f606e 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5914,14 +5914,7 @@ use with bindgen.")
("rust-winapi" ,rust-winapi-0.3)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
- ("rust-vcpkg" ,rust-vcpkg-0.2))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-openssl
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ ("rust-vcpkg" ,rust-vcpkg-0.2))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -10362,10 +10355,11 @@ DWARF debugging format.")
("rust-thread-id" ,rust-thread-id-3)
("rust-time" ,rust-time-0.1))))
(native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
`(("libgit2" ,libgit2)
("libssh2" ,libssh2)
("openssl" ,openssl)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://github.com/rust-lang/git2-rs";)
(synopsis "Rust bindings to libgit2")
@@ -13602,18 +13596,12 @@ algorithm and related formats (ZLIB, GZIP).")
("rust-openssl-sys" ,rust-openssl-sys-0.9)
;; Build dependencies:
("rust-cc" ,rust-cc-1)
- ("rust-pkg-config" ,rust-pkg-config-0.3))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'dont-vendor-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ ("rust-pkg-config" ,rust-pkg-config-0.3))))
(native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
`(("libgit2" ,libgit2)
("openssl" ,openssl)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://github.com/rust-lang/git2-rs";)
(synopsis "Native bindings to the libgit2 library")
@@ -13896,7 +13884,6 @@ allocator.")
(modify-phases %standard-phases
(add-after 'unpack 'set-missing-env-vars
(lambda* (#:key inputs #:allow-other-keys)
- (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl"))
(setenv "LIBCLANG_PATH"
(string-append (assoc-ref inputs "clang") "/lib"))
#t)))))
@@ -14139,18 +14126,12 @@ pairs in insertion order.")
;; Build dependencies:
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
- ("rust-vcpkg" ,rust-vcpkg-0.2))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'dont-vendor-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ ("rust-vcpkg" ,rust-vcpkg-0.2))))
(native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
`(("libssh2" ,libssh2)
("openssl" ,openssl)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://github.com/alexcrichton/ssh2-rs";)
(synopsis "Native bindings to the libssh2 library")
@@ -16040,17 +16021,11 @@ IO of Windows's named pipes.")
("rust-security-framework-sys" ,rust-security-framework-sys-0.3)
("rust-tempfile" ,rust-tempfile-3))
#:cargo-development-inputs
- (("rust-hex" ,rust-hex-0.3))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-openssl
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ (("rust-hex" ,rust-hex-0.3))))
(native-inputs
- `(("openssl" ,openssl)
- ("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("openssl" ,openssl)))
(home-page "https://github.com/sfackler/rust-native-tls";)
(synopsis
"Wrapper over a platform's native TLS implementation")
@@ -17633,7 +17608,7 @@ You probably don't want to link to this crate directly;
instead check out the
(substitute* "Cargo.toml"
((", path =.*}") "}"))
#t)))))
- (native-inputs
+ (inputs
`(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras
(define-public rust-openssl-probe-0.1
@@ -17677,17 +17652,11 @@ system for OpenSSL.")
("rust-autocfg" ,rust-autocfg-1.0)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
- ("rust-vcpkg" ,rust-vcpkg-0.2))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-openssl
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ ("rust-vcpkg" ,rust-vcpkg-0.2))))
(native-inputs
- `(("openssl" ,openssl)
- ("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("openssl" ,openssl)))
(home-page "https://github.com/sfackler/rust-openssl";)
(synopsis "FFI bindings to OpenSSL")
(description
@@ -17721,14 +17690,7 @@ system for OpenSSL.")
(("rust-gdi32-sys" ,rust-gdi32-sys-0.2)
("rust-libc" ,rust-libc-0.2)
("rust-user32-sys" ,rust-user32-sys-0.2)
- ("rust-pkg-config" ,rust-pkg-config-0.3))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-openssl
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))))
+ ("rust-pkg-config" ,rust-pkg-config-0.3))))))
(define-public rust-openssl-sys-extras-0.7
(package
@@ -17756,7 +17718,7 @@ system for OpenSSL.")
(substitute* "Cargo.toml"
((", path =.*}") "}"))
#t)))))
- (native-inputs
+ (inputs
`(("openssl" ,openssl-1.0))) ; openssl-1.0 specifically
(home-page "https://github.com/sfackler/rust-openssl";)
(synopsis
@@ -25752,7 +25714,7 @@ functionality and without weak references.")
(substitute* "Cargo.toml"
((", path =.*}") "}"))
#t)))))
- (native-inputs
+ (inputs
`(("openssl" ,openssl-1.0))))) ; for openssl-sys-extras
(define-public rust-sha1-asm-0.4
@@ -31008,8 +30970,9 @@ extension for the Trust-DNS client to use rustls for
TLS.")
(base32
"0vbh2y7w2s5gcw33fn4hb5f927kgjm6603vw63slg9riikmsiq43"))))
(native-inputs
- `(("openssl" ,openssl)
- ("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("openssl" ,openssl)))
(arguments
`(#:cargo-test-flags
'("--release" "--" "--skip=tests::test_tls_client_stream_ipv4")
@@ -31023,14 +30986,7 @@ extension for the Trust-DNS client to use rustls for
TLS.")
("rust-webpki" ,rust-webpki-0.19))
#:cargo-development-inputs
(("rust-openssl" ,rust-openssl-0.10)
- ("rust-tokio" ,rust-tokio-0.1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'find-openssl
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))))
+ ("rust-tokio" ,rust-tokio-0.1))))))
(define-public rust-try-from-0.3
(package
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index fabb4e0..004f71a 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -73,13 +73,7 @@
("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.4))
#:cargo-development-inputs
(("rust-datetime" ,rust-datetime-0.4))
- #:phases
(modify-phases %standard-phases
- (add-after 'configure 'dont-vendor-sources
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t))
;; Ignoring failing tests.
;; Reported in https://github.com/ogham/exa/issues/318
(add-before 'check 'disable-failing-tests
@@ -393,18 +387,12 @@ gitignore rules.")
("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1)
("rust-serde-json" ,rust-serde-json-1)
- ("rust-tempfile" ,rust-tempfile-3))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'unvendor-libraries-from-crates
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl))
- #t)))))
+ ("rust-tempfile" ,rust-tempfile-3))))
(native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
`(("libgit2" ,libgit2)
("openssl" ,openssl)
- ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(home-page "https://tokei.rs";)
(synopsis "Count code, quickly")
diff --git a/guix/build/cargo-build-system.scm
b/guix/build/cargo-build-system.scm
index 117c8da..22c5d3b 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -122,6 +122,8 @@ directory = '" port)
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
(setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
+ (when (assoc-ref inputs "openssl")
+ (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl")))
;; We don't use the Cargo.lock file to determine the package versions we use
;; during building, and in any case if one is not present it is created
- 19/45: gnu: Add rust-ring-0.14., (continued)
- 19/45: gnu: Add rust-ring-0.14., guix-commits, 2020/11/22
- 29/45: gnu: Add rust-rustls-0.15., guix-commits, 2020/11/22
- 35/45: gnu: rust-tracing-log-0.1: Update to 0.1.1., guix-commits, 2020/11/22
- 33/45: gnu: Add rust-tracing-log-0.1., guix-commits, 2020/11/22
- 22/45: gnu: Add rust-hyper-old-types-0.11., guix-commits, 2020/11/22
- 26/45: gnu: Add rust-sct-0.5., guix-commits, 2020/11/22
- 31/45: gnu: Add rust-trust-dns-proto-0.7., guix-commits, 2020/11/22
- 34/45: gnu: Add rust-matchers-0.0., guix-commits, 2020/11/22
- 32/45: gnu: Add rust-trust-dns-rustls-0.6., guix-commits, 2020/11/22
- 40/45: gnu: Add rust-thrussh-libsodium-0.1., guix-commits, 2020/11/22
- 41/45: build-system/cargo: Set openssl environment variable when available.,
guix-commits <=
- 44/45: gnu: rust-slog-2.5: Rename to rust-slog-2., guix-commits, 2020/11/22
- 36/45: gnu: Add rust-tracing-subscriber-0.1., guix-commits, 2020/11/22
- 38/45: gnu: Add rust-tokio-net-0.2., guix-commits, 2020/11/22
- 43/45: gnu: rust-slog-2.4: Remove variable., guix-commits, 2020/11/22
- 39/45: gnu: Add rust-shell-escape-0.1., guix-commits, 2020/11/22
- 42/45: build-system/cargo: Set libclang environment variable when available., guix-commits, 2020/11/22
- 37/45: gnu: Add rust-tracing-fmt-0.1., guix-commits, 2020/11/22
- 45/45: build-system/cargo: Set gettext environment variable when available., guix-commits, 2020/11/22