gnu: openssl: Fix the call of 'apply invoke'.
This fixes the build failure introduced in commit 05f6e6014
.
* gnu/packages/tls.scm (openssl, openssl-next)[arguments]: Pass configure
flags to 'apply invoke' as the ARGLIST list.
This commit is contained in:
parent
8ea5d8685c
commit
5011d3f4a0
|
@ -298,24 +298,25 @@ (define-public openssl
|
||||||
(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"
|
(apply invoke "./config"
|
||||||
"shared" ;build shared libraries
|
(list
|
||||||
"--libdir=lib"
|
"shared" ;build shared libraries
|
||||||
|
"--libdir=lib"
|
||||||
|
|
||||||
;; The default for this catch-all directory is
|
;; The default for this catch-all directory is
|
||||||
;; PREFIX/ssl. Change that to something more
|
;; PREFIX/ssl. Change that to something more
|
||||||
;; conventional.
|
;; conventional.
|
||||||
(string-append "--openssldir=" out
|
(string-append "--openssldir=" out
|
||||||
"/share/openssl-" ,version)
|
"/share/openssl-" ,version)
|
||||||
|
|
||||||
(string-append "--prefix=" out)
|
(string-append "--prefix=" out)
|
||||||
|
|
||||||
;; XXX FIXME: Work around a code generation bug in GCC
|
;; XXX FIXME: Work around a code generation bug in GCC
|
||||||
;; 4.9.3 on ARM when compiled with -mfpu=neon. See:
|
;; 4.9.3 on ARM when compiled with -mfpu=neon. See:
|
||||||
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
|
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
|
||||||
,@(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,25 +423,26 @@ (define-public openssl-next
|
||||||
(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"
|
(apply invoke "./config"
|
||||||
"shared" ;build shared libraries
|
(list
|
||||||
"--libdir=lib"
|
"shared" ;build shared libraries
|
||||||
|
"--libdir=lib"
|
||||||
|
|
||||||
;; The default for this catch-all directory is
|
;; The default for this catch-all directory is
|
||||||
;; PREFIX/ssl. Change that to something more
|
;; PREFIX/ssl. Change that to something more
|
||||||
;; conventional.
|
;; conventional.
|
||||||
(string-append "--openssldir=" out
|
(string-append "--openssldir=" out
|
||||||
"/share/openssl-" ,version)
|
"/share/openssl-" ,version)
|
||||||
|
|
||||||
(string-append "--prefix=" out)
|
(string-append "--prefix=" out)
|
||||||
(string-append "-Wl,-rpath," lib)
|
(string-append "-Wl,-rpath," lib)
|
||||||
|
|
||||||
;; XXX FIXME: Work around a code generation bug in GCC
|
;; XXX FIXME: Work around a code generation bug in GCC
|
||||||
;; 4.9.3 on ARM when compiled with -mfpu=neon. See:
|
;; 4.9.3 on ARM when compiled with -mfpu=neon. See:
|
||||||
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
|
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
|
||||||
,@(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.
|
||||||
|
|
Loading…
Reference in a new issue