From patchwork Fri Jun 18 16:09:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30383 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1A1B27BC81; Fri, 18 Jun 2021 17:14:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3130B27BC78 for ; Fri, 18 Jun 2021 17:14:46 +0100 (BST) Received: from localhost ([::1]:47396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH8n-0007JY-6x for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:14:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5H-0000O7-KR for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5H-00027W-9j for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5H-0002ys-60 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 18/37] openssl: Use G-exp machinery for referring to outputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403264311197 (code B ref 49025); Fri, 18 Jun 2021 16:11:07 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:43 +0000 Received: from localhost ([127.0.0.1]:57787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4t-0002uR-7E for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:43 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4W-0002rE-PT for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:21 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAKNQ; Fri, 18 Jun 2021 18:10:20 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:17 +0200 Message-Id: <20210618160936.18972-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032620; bh=YhqcZofahoNOOGEzlc59JaojMMV5QRbpQX/W3AtKzII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=flTxiKhyorrkgidYdHTWRPElsM7qJLiZu5c2T1HcyCF4kNYCRnxB0WMwMQhXrst8o z0ta5ql3xlkQS5KtqDXxqnFwAi8+zILepo4LDtiuG7pdfEhetKAfBtc/1Pk3glyUk9 n9KWV2cMhy5PO+l5AV2Ek6hxlkJHRF8nlHT3Br+e1/0vIPQEeLVcXWgZg+D2pYc5dp 3Qm85Hhu066cydBgkUFx9QYhH3DAqjqM/20k4THXT9A8LjIe2OPNUvcyF4S1cuqueI 1YRoJzgKEumvHd7gSiojQW7h4+am1H0B2wYdfmRZllSyty1FCTvyu5DWERDT+jqkri fv7X+ZUFP0z5g== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. --- 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 9de9a78e84..90211c733d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -347,7 +348,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 @@ -371,8 +372,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" @@ -398,23 +399,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) @@ -423,13 +424,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")