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

gnu: openssl: Use invoke instead of system*. 

* gnu/packages/tls.scm (openssl, openssl-next)[arguments]: Use invoke.
Add missing 'apply'.
This commit is contained in:
Mark H Weaver 2018-03-16 03:56:45 -04:00
parent 3158bc043e
commit 05f6e60141
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gnu/packages/tls.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
@ -297,26 +297,25 @@ 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")))
(zero? (apply invoke "./config"
(system* "./config" "shared" ;build shared libraries
"shared" ;build shared libraries "--libdir=lib"
"--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,27 +421,26 @@ 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")))
(zero? (apply invoke "./config"
(system* "./config" "shared" ;build shared libraries
"shared" ;build shared libraries "--libdir=lib"
"--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.