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 QJwtN9x5x2BbZQAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 17:46:36 +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 qJ6pMtx5x2AfEQAAbx9fmQ (envelope-from ) for ; Mon, 14 Jun 2021 15:46:36 +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 5613A25FCA for ; Mon, 14 Jun 2021 17:46:36 +0200 (CEST) Received: from localhost ([::1]:52424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonL-0005DB-CV for larch@yhetil.org; Mon, 14 Jun 2021 11:46:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsof8-000055-C7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsof8-0007AO-3p for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsof8-0004Es-1R for guix-patches@gnu.org; Mon, 14 Jun 2021 11:38:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 17/37] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 15:38:05 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368507516170 (code B ref 49025); Mon, 14 Jun 2021 15:38:05 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:37:55 +0000 Received: from localhost ([127.0.0.1]:47535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoew-0004Ck-LA for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:54 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoev-0004Ah-Ax for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:37:53 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3ds2500i0mfAB4063dsBN; Mon, 14 Jun 2021 17:37:53 +0200 Message-ID: <6ef2004dd9701ac6e886ba121b3fe0a113741aa3.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:37:52 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-lSLuRJRRJqrHCSk2uzHE" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685073; bh=kTSjcdjvjf+9HkDG4i3zlg/A9UJgJ7JJ4bB5EfYFO6k=; h=Subject:From:To:Date:In-Reply-To:References; b=EfnSj3WDTM+YnK+5xCbNzNT18CmFY+tcBPaBik3KR2AkXU6gAMkFZPY6qyl6DZ5I7 IYGS1HWWT0YBgCOf/1SqoHQJ+uDnj3/JOe5rBA/l28gZfAkeot1mepv+j8rPYCuzq1 ey7v15MiyHSDJ150uYEpYHVyZuhIWhPCdanMq0tQIElANi2KmxbjKs5ZPxS4a65BOF JcQHESl+fGK0VrXOV7I9C9FD0Ca1AZABxvHgkoNK8oDlBZGoYyIZWieP/QrwgeEbWV 8I6SPP3wekDbL7k2lW6Q7RAdrBLiBEAtp1lHN+Kfss9WckiVT9ZfM+AtIW4DVgxlcG iXxByk4FPucWA== 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=1623685596; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=kTSjcdjvjf+9HkDG4i3zlg/A9UJgJ7JJ4bB5EfYFO6k=; b=KjQqMuIBn1eC7hY5hG/xLJgCV10iBCql1U6Jli5a+U2BHlr9cf7eDB3nR7/elPHnoqhWGa qEv7K//nYKPSWwrAjtyP0Alavr3TmegD0fIo+9DJCFWwuCOz9hHc17ThrRDXuLCYcjulBd noTU2oQQLzTyNlqcHGOY+8KcWSBsCbdjRXXSNa9pA5zH1ckB+0VC78l5H6Trj7Xf8ek1/F Z6d9yCxedcqvPq4wccvBGubD7rc9kZqUcjtlAIx4hJJS1nNakAUn52WBJG1fO7YF4B1y9e /gTSZA8ftI6UijDZDLtNYGkaLP+4SNXgqzukrIRMqZ2smXqzTc86bxWrDx23Jg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623685596; a=rsa-sha256; cv=none; b=pcdxSHNpHydcIo/n9iqyEfImsBCU6v46AyE1zKIMqWUy7I4o5fBRjk4l6vSnwhHRVO0d+r +gxtmcLRtK46kx8p2tDrNsDtbGT3UZnZ3eaYDASYBwiOURkJncAg7D5Loud0Hpee6oIJm6 GqyWPr/wUdFANTu9IhbpBMAjgtGt4lM9qE83HacISQ/7+F1TXphg3RdSGMpRk8sqqF97t2 PL6CNp9XVjNM/dQhrANE1b0EM41XYoQszCh1RyLy05XU/tSL6oOYrVnofxb1VHnHpCbusC 9EI6Ade5E6ikPcF0TSEB40EOffbDAA3cPqBE9oFssFXC+lQz8xcjN2Bmg9jJjQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=EfnSj3WD; 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.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=EfnSj3WD; 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: 5613A25FCA X-Spam-Score: -1.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: WftdTsGXI3+o --=-lSLuRJRRJqrHCSk2uzHE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit This allows using this-package-native-input later. * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Make this a G-expression. (openssl-1.0)[arguments]<#:phases>: Likewise. --- gnu/packages/tls.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) --=-lSLuRJRRJqrHCSk2uzHE Content-Disposition: attachment; filename="0017-openssl-Make-the-phases-argument-a-G-expression.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0017-openssl-Make-the-phases-argument-a-G-expression.patch"; charset="us-ascii" diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 5bfc5545db..9de9a78e84 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -38,6 +38,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -341,9 +342,10 @@ required structures.") ;; so we explicitly disallow it here. #:disallowed-references ,(list (canonical-package perl)) #:phases + ,#~ (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before + #$@(if (%current-target-system) + #~((add-before 'configure 'set-cross-compile (lambda* (#:key target outputs #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) @@ -367,7 +369,7 @@ required structures.") "linux-ppc64") ((string-prefix? "powerpc" target) "linux-ppc")))))) - '()) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -377,9 +379,9 @@ required structures.") (("/usr/bin/env") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -388,13 +390,13 @@ required structures.") ;; conventional. (string-append "--openssldir=" out "/share/openssl-" - ,(package-version this-package)) + #$(package-version this-package)) (string-append "--prefix=" out) (string-append "-Wl,-rpath," lib) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + #~((getenv "CONFIGURE_TARGET_ARCH")) + #~()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -426,7 +428,7 @@ required structures.") ;; 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) + #$(package-version this-package) "/misc")))))))) (native-search-paths (list (search-path-specification @@ -471,7 +473,7 @@ required structures.") ;; Parallel build is not supported in 1.0.x. ((#:parallel-build? _ #f) #f) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-before 'patch-source-shebangs 'patch-tests (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) @@ -494,9 +496,9 @@ required structures.") ;; Override this phase because OpenSSL 1.0 does not understand -rpath. (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + (invoke #$@(if (%current-target-system) + #~("./Configure") + #~("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -504,12 +506,12 @@ required structures.") ;; PREFIX/ssl. Change that to something more ;; conventional. (string-append "--openssldir=" out - "/share/openssl-" ,version) + "/share/openssl-" #$version) (string-append "--prefix=" out) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + #$@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (delete 'move-extra-documentation) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys) @@ -534,7 +536,7 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) + #$version "/misc")) #t))))))))) (define-public libressl --=-lSLuRJRRJqrHCSk2uzHE--