nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: openssl: Simplify calls to 'invoke'. 

* gnu/packages/tls.scm (openssl, openssl-next)[arguments]: In the
'configure' phase, simplify the calls to 'invoke'.
This commit is contained in:
Mark H Weaver 2018-03-17 17:05:28 -04:00
parent 5011d3f4a0
commit 0d98cb9a39
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/tls.scm
View File

@ -297,8 +297,7 @@ required structures.")
'configure 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(apply invoke "./config" (invoke "./config"
(list
"shared" ;build shared libraries "shared" ;build shared libraries
"--libdir=lib" "--libdir=lib"
@ -316,7 +315,7 @@ required structures.")
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(string-prefix? "armhf" (%current-system))) (string-prefix? "armhf" (%current-system)))
'("-mfpu=vfpv3") '("-mfpu=vfpv3")
'())))))) '())))))
(add-after (add-after
'install 'make-libraries-writable 'install 'make-libraries-writable
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -422,8 +421,7 @@ required structures.")
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))) (lib (string-append out "/lib")))
(apply invoke "./config" (invoke "./config"
(list
"shared" ;build shared libraries "shared" ;build shared libraries
"--libdir=lib" "--libdir=lib"
@ -442,7 +440,7 @@ required structures.")
,@(if (and (not (%current-target-system)) ,@(if (and (not (%current-target-system))
(string-prefix? "armhf" (%current-system))) (string-prefix? "armhf" (%current-system)))
'("-mfpu=vfpv3") '("-mfpu=vfpv3")
'())))))) '())))))
;; XXX: Duplicate this phase to make sure 'version' evaluates ;; XXX: Duplicate this phase to make sure 'version' evaluates
;; in the current scope and not the inherited one. ;; in the current scope and not the inherited one.