From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iOHtNPTH7mAcggEAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 13:18:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sJmFMPTH7mDeNwAAbx9fmQ (envelope-from ) for ; Wed, 14 Jul 2021 11:18:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 272E613B09 for ; Wed, 14 Jul 2021 13:18:12 +0200 (CEST) Received: from localhost ([::1]:53502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3cu3-0006j0-8H for larch@yhetil.org; Wed, 14 Jul 2021 07:18:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3cqA-000172-Ck for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3cq8-00010R-Q3 for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3cq7-0001Qm-LX for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v6 14/22] 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: Wed, 14 Jul 2021 11:14: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: Mathieu Othacehe , Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.16262612215308 (code B ref 49025); Wed, 14 Jul 2021 11:14:07 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jul 2021 11:13:41 +0000 Received: from localhost ([127.0.0.1]:43169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpg-0001NR-G7 for submit@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:40 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpR-0001Je-CI for 49025@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:25 -0400 Received: from localhost.localdomain ([188.188.219.228]) by andre.telenet-ops.be with bizsmtp id UzDG2500W4wFxCU01zDQGA; Wed, 14 Jul 2021 13:13:25 +0200 From: Maxime Devos Date: Wed, 14 Jul 2021 13:12:59 +0200 Message-Id: <20210714111307.19324-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210714111307.19324-1-maximedevos@telenet.be> References: <20210714111307.19324-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626261205; bh=3B3QDGP7dkXVyEAZJY8WCsdDeSjbBRGSdZVIeTRN4/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CiWy67s/8m5qJI6r8IDGYwcNRXb6r87IUAQJv3UOUXyEGUYJJBX9Cz/WaOtCOG+aL Pfosp6QtHqlT2KZZ99387cfeaKydSf7b2pZt7fqvlKAAcVn88NGqy/8OKRHdT3sEQJ AfsvqNG2osnPQql+/8xRVftt7Z1hvoVDTtu2rqoZPeCYeGzE9I7AHsK86Tu+6iTjxN FDroTuUH/XKGALkBC/uj0y2I372CHFR2Seyxv3MXt7sxSR43Wrha4U7/0Eph6r93PA bbo9yiDnwY65wT0Ghm+xXl5TPPD/jzLKLv61c3LmXAZODT2Ddx3sFqWQohr/v5VSr8 EvYN+PMf/7fDw== 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626261492; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3B3QDGP7dkXVyEAZJY8WCsdDeSjbBRGSdZVIeTRN4/s=; b=Re+1B/ow3dklxVk5MV9v140RuhqPCjoOGiwDfFaFctHplTNtPD765D/QyRAf8VxPF5L2no ZFbXG5Zw8KlwOALdau4YKm/sjNZ3afTHeb6BVOSYnmBcj25Eno9QR5XJlHHlZFGIQvc32m YWj4WwIgdyn5zm76I+lhgotjBmQnBOKACdT6a6qnwg/CAj2tgeoBi+DiDdg9JJFfB/qOVu sCmyFleJPVrdG4TkDCqJhxNXhvT5gFSZX3J5YO+AiBcHaByQVgbY9VgKM/6LuiQwi5GIKL ay2wlF3HUdJttx+A7RO6ehr4ZAUHB5ghM7dujRhsffVo8mbrccPwA+HSF0xa5Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626261492; a=rsa-sha256; cv=none; b=RmERMj6warFnOagolmKisgu0ikH6oZ/4c6h6lUOR3cFXW8ruw9kK+LKRPpnVJwJzFpog1N 42d9Os/ijIuD+9yLDDh/h74/Wt+1g37u+0vSnntT+1qpIklmmEEJckMl2kmD/CIyhC0oep LRM5fl/MGjuvVuTvez+lv+v6L0ADsQUMFse62x9Ct/LIlKKwWB7HNL2uGcVqDF3RvJ8YjO ahLSZHLQ/hdyKV8G9HajVR/Xqa9PpBvC3vlbtrZj+MblvqL7rEG+G7mYQ7Wmc8w7PVFGUi GMn6bsYOqk9ebXaH1M6Rz+p8ntUf98jEv0PGNfCazqYIdnZ7bE3AaUOU5PvQoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="CiWy67s/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="CiWy67s/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 272E613B09 X-Spam-Score: -0.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: Q//Ve4Ocg6Gv 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 0024709a96..fd4a8b07b2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Maxime Devos ;;; ;;; 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") -- 2.32.0