[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/20: openssl: Use G-exp machinery for referring to outputs.
From: |
guix-commits |
Subject: |
12/20: openssl: Use G-exp machinery for referring to outputs. |
Date: |
Mon, 12 Jul 2021 11:15:43 -0400 (EDT) |
mothacehe pushed a commit to branch wip-meson
in repository guix.
commit 0db08c824a1ecb292ed87d6c0f1d6e68905c7ab9
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Jul 11 13:47:15 2021 +0200
openssl: Use G-exp machinery for referring to outputs.
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>
---
gnu/packages/tls.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 0024709..fd4a8b0 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Solene Rapenne <solene@perso.pw>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -345,7 +346,7 @@ required structures.")
#$@(if (%current-target-system)
#~((add-before
'configure 'set-cross-compile
- (lambda* (#:key target outputs #:allow-other-keys)
+ (lambda* (#:key target #:allow-other-keys)
(setenv "CROSS_COMPILE" (string-append target "-"))
(setenv "CONFIGURE_TARGET_ARCH"
(cond
@@ -369,8 +370,8 @@ required structures.")
"linux-ppc"))))))
#~())
(replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (lambda _
+ (let* ((out #$output)
(lib (string-append out "/lib")))
;; It's not a shebang so patch-source-shebangs misses it.
(substitute* "config"
@@ -396,23 +397,23 @@ required structures.")
#~((getenv "CONFIGURE_TARGET_ARCH"))
#~())))))
(add-after 'install 'move-static-libraries
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda _
;; Move static libraries to the "static" output.
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((out #$output)
(lib (string-append out "/lib"))
- (static (assoc-ref outputs "static"))
+ (static #$output:static)
(slib (string-append static "/lib")))
(for-each (lambda (file)
(install-file file slib)
(delete-file file))
(find-files lib "\\.a$")))))
(add-after 'install 'move-extra-documentation
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda _
;; 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"))
(html (string-append out "/share/doc/openssl"))
- (doc (assoc-ref outputs "doc"))
+ (doc #$output:doc)
(man-target (string-append doc "/share/man/man3"))
(html-target (string-append doc "/share/doc/openssl")))
(copy-recursively man3 man-target)
@@ -421,13 +422,12 @@ required structures.")
(delete-file-recursively html))))
(add-after
'install 'remove-miscellany
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda _
;; The 'misc' directory contains random undocumented shell and Perl
;; scripts. Remove them to avoid retaining a reference on Perl.
- (let ((out (assoc-ref outputs "out")))
- (delete-file-recursively (string-append out "/share/openssl-"
- #$(package-version
this-package)
- "/misc"))))))))
+ (delete-file-recursively (string-append #$output "/share/openssl-"
+ #$(package-version
this-package)
+ "/misc")))))))
(native-search-paths
(list (search-path-specification
(variable "SSL_CERT_DIR")
- 08/20: libgpg-error: Fix cross-compilation error., (continued)
- 08/20: libgpg-error: Fix cross-compilation error., guix-commits, 2021/07/12
- 18/20: glib: Look up "tzdata" in 'native-inputs', not 'inputs'., guix-commits, 2021/07/12
- 10/20: openssl: Remove trailing #t from phases., guix-commits, 2021/07/12
- 17/20: glib: Verify the cross-compiled python is used in installed scripts., guix-commits, 2021/07/12
- 15/20: openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., guix-commits, 2021/07/12
- 07/20: libgpg-error: Prevent silent miscompilation some systems., guix-commits, 2021/07/12
- 09/20: python: Fix reference to input when cross-compiling., guix-commits, 2021/07/12
- 13/20: openssl: Move documentation instead of copying and deleting it., guix-commits, 2021/07/12
- 14/20: openssl: Move all man pages to separate output, not only man3., guix-commits, 2021/07/12
- 01/20: utils: Define target-linux? predicate., guix-commits, 2021/07/12
- 12/20: openssl: Use G-exp machinery for referring to outputs.,
guix-commits <=
- 03/20: packages: Define this-package-input and this-package-native-input., guix-commits, 2021/07/12
- 05/20: tzdata: Don't bother with cross-compiling., guix-commits, 2021/07/12
- 19/20: libelf: Update configure script and config.guess and config.sub., guix-commits, 2021/07/12