[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: build: cargo-build-system: Add pkg-config environment variables.
From: |
guix-commits |
Subject: |
08/08: build: cargo-build-system: Add pkg-config environment variables. |
Date: |
Mon, 27 Jan 2020 12:47:27 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 61b95c15cfb2c9b0d02cf09f93c0df76be0972b5
Author: Efraim Flashner <address@hidden>
AuthorDate: Mon Jan 27 09:17:32 2020 +0200
build: cargo-build-system: Add pkg-config environment variables.
* guix/build/cargo-build-system.scm (configure): Add environment
variables to use system libgit2 and libssh2.
* gnu/packages/crates-io.scm (rust-libgit2-sys-0.10,
rust-libssh2-sys-0.2)[arguments]: Remove LIBGIT2 and LIBSSH2 environment
variable settings.
* gnu/packages/rust-apps.scm (tokei)[arguments]: Same.
---
gnu/packages/crates-io.scm | 3 ---
gnu/packages/rust-apps.scm | 4 +---
guix/build/cargo-build-system.scm | 2 ++
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1099a25..a5f224f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -5626,8 +5626,6 @@ values of all the exported APIs match the platform that
libc is compiled for.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
- (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
- (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
#t)))))
(native-inputs
`(("libgit2" ,libgit2)
@@ -5734,7 +5732,6 @@ functions and static variables these libraries contain.")
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
(setenv "OPENSSL_DIR" openssl))
- (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
#t)))))
(native-inputs
`(("libssh2" ,libssh2)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index d9a672f..90bd146 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -143,9 +143,7 @@ gitignore rules.")
(add-after 'configure 'unvendor-libraries-from-crates
(lambda* (#:key inputs #:allow-other-keys)
(let ((openssl (assoc-ref inputs "openssl")))
- (setenv "OPENSSL_DIR" openssl)
- (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
- (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1"))
+ (setenv "OPENSSL_DIR" openssl))
#t)))))
(native-inputs
`(("libgit2" ,libgit2)
diff --git a/guix/build/cargo-build-system.scm
b/guix/build/cargo-build-system.scm
index 78c27a2..0721989 100644
--- a/guix/build/cargo-build-system.scm
+++ b/guix/build/cargo-build-system.scm
@@ -119,6 +119,8 @@ directory = '" port)
;; upgrading the compiler for example.
(setenv "RUSTFLAGS" "--cap-lints allow")
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
+ (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
+ (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
;; 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
- branch master updated (2afae7f -> 61b95c1), guix-commits, 2020/01/27
- 01/08: build: cargo-build-system: Allow patched crates., guix-commits, 2020/01/27
- 02/08: gnu: rust-libgit2-sys-0.10: Remove vendored code., guix-commits, 2020/01/27
- 03/08: gnu: rust-jemalloc-sys-0.3: Remove vendored code., guix-commits, 2020/01/27
- 05/08: gnu: rust-lzma-sys-0.1: Remove vendored code., guix-commits, 2020/01/27
- 06/08: gnu: rust-libz-sys-1.0: Remove vendored code., guix-commits, 2020/01/27
- 04/08: gnu: rust-libssh2-sys-0.2: Remove vendored code., guix-commits, 2020/01/27
- 07/08: gnu: rust-pcre2-sys-0.2: Delete vendored code., guix-commits, 2020/01/27
- 08/08: build: cargo-build-system: Add pkg-config environment variables.,
guix-commits <=