From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ANpdIgDWzGBgYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:21:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id uMUnHgDWzGALSgAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 17:21:04 +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 F239012106 for ; Fri, 18 Jun 2021 19:21:03 +0200 (CEST) Received: from localhost ([::1]:49650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIAw-0007tj-AB for larch@yhetil.org; Fri, 18 Jun 2021 13:21:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA6-0007pl-Hc for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA6-0004Cj-57 for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA6-0004tO-1P for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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 17:20:09 +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.162403676818498 (code B ref 49025); Fri, 18 Jun 2021 17:20:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:28 +0000 Received: from localhost ([127.0.0.1]:58046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9P-0004oB-V0 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:28 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9B-0004j8-2r for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:13 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKCcl; Fri, 18 Jun 2021 19:19:12 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:12 +0200 Message-Id: <20210618171631.20534-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-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=1624036752; bh=YhqcZofahoNOOGEzlc59JaojMMV5QRbpQX/W3AtKzII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=jIehDTMQTpTzukeWkgC//KPla3LnoInPDFfBlnZNrF7DWXC2+oAtr0GjWyxypxiAa hUPQRvJO8mp4pX+CFKJ5pKhYMDPcdn1PlIpWLupzAFWPGtt3sqPXZph/TbE1reUa2a yZruSYSeowxnAXxg9YbTFxg3Mw6p0fz2wSefC3speTT5Fsrrli4F+fhxcvsvVOOzle 4EHDD0X7dctKNtRgomQFzAAM4DdIX7uHSFZwZz5NZBolcNJbczPFInqOkswoJtaVIL 0s2b/Sc1fgHo14hAaa2tBLkgFxILWRSRjbVHl+BbbgHKhHi8NEDE03sdCn4nR5a1Jx gyfNSiRQCmoMQ== 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+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=1624036864; h=from:from:sender:sender:reply-to: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=YhqcZofahoNOOGEzlc59JaojMMV5QRbpQX/W3AtKzII=; b=DYHPkAEY5mM1BH/1G/jTnCk3zp4DqkKMM2l7l/tbxok04ovTXLozMnE84CV/tvT3hoUzzW VFnqF5/ZB0DFW7Eer3ylGUQgnC4t3BrEpmavwhu0ted5H8nnB4SnDPdm+E8fTOg3m6HuJN 4OBYWdKrMcCOrMjKhWFhe1vs0GKIxIH+YuhqHxPa5H0ZCirsamVlZlF1G6/1qupbg2CIqx OO3IAtQW9xtjiHxgtpNhA4NR+BubyRrEK5pAnwSeGcH0AxZ/tD2QmiGpRxR+/Rlmlz+zV8 l+AWZtBN02C1tWCimIg2crbOVmLmLQB1buRJvi7kB++EuUvrrrX+wJtidej0Uw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036864; a=rsa-sha256; cv=none; b=jKqQbcGBu38RDYKv9PTRS5lPtx3UcLgXRV5wMYt4DlcQnSpLtrnhmCyilCGhHwUcNLCzFo y9IxtlHXtaw5Ms9GyRT9KucuxhEOdcWFRl/iUR7xKynzfqsb1OF6Cb0+5+rB7uMHgL2W7y PzoR6vzey4ljcH2PbiDcdTUZG01Z9/USdQGXsJdSlUnNpDiTY0bljo1uGSf7TuRoac+r0P YmreHaDt4xOIgq0HGpCqd+KLSWwbbBUbw98OrBLSQjCJGktINPmqwBRIv33nNLsDm8Usyp n4AzuCUpJ3DR6svIzKy2eHPlUeEmG+bg/pF3n2beqRXNl0FljI1l59qw3yGQFw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=jIehDTMQ; 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: 1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=jIehDTMQ; 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: F239012106 X-Spam-Score: 1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: mw86ahih1qzp 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") -- 2.32.0