me/guix
Archived
1
0
Fork 0
Code Activity

openssl: Use G-exp machinery for referring to outputs.

Browse source 
This doesn't fix anything broken, just for simplifying
the code a little while we're rebuilding the world anyway.
IMHO this makes the code a little more readable.

* gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Don't refer
  to the association list 'outputs', use #$output, #$output:doc
  and #$output:static instead.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Maxime Devos 2021-07-14 13:12:59 +02:00 • committed by Mathieu Othacehe
parent 7c0eaa1f9e
commit f64a35b9de
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/tls.scm
View file

@ -18,6 +18,7 @@
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw> ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -345,7 +346,7 @@ required structures.")
#$@(if (%current-target-system) #$@(if (%current-target-system)
#~((add-before #~((add-before
'configure 'set-cross-compile 'configure 'set-cross-compile
(lambda* (#:key target outputs #:allow-other-keys) (lambda* (#:key target #:allow-other-keys)
(setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CROSS_COMPILE" (string-append target "-"))
(setenv "CONFIGURE_TARGET_ARCH" (setenv "CONFIGURE_TARGET_ARCH"
(cond (cond
@ -369,8 +370,8 @@ required structures.")
"linux-ppc")))))) "linux-ppc"))))))
#~()) #~())
(replace 'configure (replace 'configure
(lambda* (#:key outputs configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out #$output)
(lib (string-append out "/lib"))) (lib (string-append out "/lib")))
;; It's not a shebang so patch-source-shebangs misses it. ;; It's not a shebang so patch-source-shebangs misses it.
(substitute* "config" (substitute* "config"
@ -400,23 +401,23 @@ required structures.")
;; Output the configure variables. ;; Output the configure variables.
(invoke "perl" "configdata.pm" "--dump")))) (invoke "perl" "configdata.pm" "--dump"))))
(add-after 'install 'move-static-libraries (add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; Move static libraries to the "static" output. ;; Move static libraries to the "static" output.
(let* ((out (assoc-ref outputs "out")) (let* ((out #$output)
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(static (assoc-ref outputs "static")) (static #$output:static)
(slib (string-append static "/lib"))) (slib (string-append static "/lib")))
(for-each (lambda (file) (for-each (lambda (file)
(install-file file slib) (install-file file slib)
(delete-file file)) (delete-file file))
(find-files lib "\\.a$"))))) (find-files lib "\\.a$")))))
(add-after 'install 'move-extra-documentation (add-after 'install 'move-extra-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; Move man3 pages and full HTML documentation to "doc". ;; Move man3 pages and full HTML documentation to "doc".
(let* ((out (assoc-ref outputs "out")) (let* ((out #$output)
(man3 (string-append out "/share/man/man3")) (man3 (string-append out "/share/man/man3"))
(html (string-append out "/share/doc/openssl")) (html (string-append out "/share/doc/openssl"))
(doc (assoc-ref outputs "doc")) (doc #$output:doc)
(man-target (string-append doc "/share/man/man3")) (man-target (string-append doc "/share/man/man3"))
(html-target (string-append doc "/share/doc/openssl"))) (html-target (string-append doc "/share/doc/openssl")))
(copy-recursively man3 man-target) (copy-recursively man3 man-target)
@ -425,13 +426,12 @@ required structures.")
(delete-file-recursively html)))) (delete-file-recursively html))))
(add-after (add-after
'install 'remove-miscellany 'install 'remove-miscellany
(lambda* (#:key outputs #:allow-other-keys) (lambda _
;; The 'misc' directory contains random undocumented shell and Perl ;; The 'misc' directory contains random undocumented shell and Perl
;; scripts. Remove them to avoid retaining a reference on Perl. ;; scripts. Remove them to avoid retaining a reference on Perl.
(let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append #$output "/share/openssl-"
(delete-file-recursively (string-append out "/share/openssl-" #$(package-version this-package)
#$(package-version this-package) "/misc")))))))
"/misc"))))))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "SSL_CERT_DIR") (variable "SSL_CERT_DIR")