[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: openssl: Simplify calls to 'invoke'.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: openssl: Simplify calls to 'invoke'. |
Date: |
Sat, 17 Mar 2018 17:13:49 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 0d98cb9a391a06490feed8f10c0b442bab28cd9d
Author: Mark H Weaver <address@hidden>
Date: Sat Mar 17 17:05:28 2018 -0400
gnu: openssl: Simplify calls to 'invoke'.
* gnu/packages/tls.scm (openssl, openssl-next)[arguments]: In the
'configure' phase, simplify the calls to 'invoke'.
---
gnu/packages/tls.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f4a887a..a915dae 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -297,8 +297,7 @@ required structures.")
'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (apply invoke "./config"
- (list
+ (invoke "./config"
"shared" ;build shared libraries
"--libdir=lib"
@@ -316,7 +315,7 @@ required structures.")
,@(if (and (not (%current-target-system))
(string-prefix? "armhf" (%current-system)))
'("-mfpu=vfpv3")
- '()))))))
+ '())))))
(add-after
'install 'make-libraries-writable
(lambda* (#:key outputs #:allow-other-keys)
@@ -422,8 +421,7 @@ required structures.")
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")))
- (apply invoke "./config"
- (list
+ (invoke "./config"
"shared" ;build shared libraries
"--libdir=lib"
@@ -442,7 +440,7 @@ required structures.")
,@(if (and (not (%current-target-system))
(string-prefix? "armhf" (%current-system)))
'("-mfpu=vfpv3")
- '()))))))
+ '())))))
;; XXX: Duplicate this phase to make sure 'version' evaluates
;; in the current scope and not the inherited one.