From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GQjCD8Pa6mCRUAAAgWs5BA (envelope-from ) for ; Sun, 11 Jul 2021 13:49:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UB8DC8Pa6mBYNwAAB5/wlQ (envelope-from ) for ; Sun, 11 Jul 2021 11:49:23 +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 CCB2C2A145 for ; Sun, 11 Jul 2021 13:49:22 +0200 (CEST) Received: from localhost ([::1]:50486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2XxZ-0004ua-Ta for larch@yhetil.org; Sun, 11 Jul 2021 07:49:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2XxK-00048v-SW for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2XxK-0008K3-I8 for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2XxK-00074m-I5 for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v5 11/20] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jul 2021 11:49:06 +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: Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162600409527003 (code B ref 49025); Sun, 11 Jul 2021 11:49:06 +0000 Received: (at 49025) by debbugs.gnu.org; 11 Jul 2021 11:48:15 +0000 Received: from localhost ([127.0.0.1]:34064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwV-00071N-B0 for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:15 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:38540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwK-0006yM-IO for 49025@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:05 -0400 Received: from localhost.localdomain ([213.119.242.127]) by xavier.telenet-ops.be with bizsmtp id Tnno2500V2ldwth01no3s6; Sun, 11 Jul 2021 13:48:04 +0200 From: Maxime Devos Date: Sun, 11 Jul 2021 13:47:14 +0200 Message-Id: <20210711114723.27568-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711114723.27568-1-maximedevos@telenet.be> References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> <20210711114723.27568-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626004084; bh=JHdidYibbmla5GyzrkyF1oyuXoOo0MlYIgVGOuNjBkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AxtG/gz5gqXUz21c/HVBQlxaNRdshWm1jhnVDKdEa0/2CHIfJcVl8xsVZxtMT0/wR sCo25n8j1HKHJPA8ilPOHO3GzFox8ddV1uminI889naq+I7i48A0TVC6QUIxkdXkfz m3brdINxDXfyAiMP8a8P9FHWDrn+RoFKCpxBKME8igx2cgvdOPCfEPAfXoVOU0KXGA 1Ec7axiaqlsChsHTcuGTogwhnRxtrum3dscWR2B3hfWalT4Y+5sqLY+u7x69cmwa52 qzqUB23QpqACWKkj0+T8BFvf7ebIQXBOEbbtO6/vAJIT181p4OiY7/2B4BeNVdEBeP /3mKcUQak39zA== 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=1626004162; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=JHdidYibbmla5GyzrkyF1oyuXoOo0MlYIgVGOuNjBkE=; b=cbp1GMWj5pfqP0wgkVlOLqfjULxYwIBGz4qCsjr1jnB9ZYkXvYRk6cMKuJxrT6afh8GAiR phTtX5CGV7btKcE9PMT/T8qVDaK81PF3ZYueW+WDS+6qeJndv9KPIeMO8ANIDjaCxrfdKC Q5MsiXs5d8gOO+WjvIMwEsQQVZKLsPbMxjPZZSVZlNcLzc4/exChET1089+F5TKVeh8M/K gEdPhOQyx+cSh9sF4hzWpxdnQbetIAd4msATKd/9D0T+XKPRaAlSGbMVXSQ9jgbgB3z14s CldRrHwxXskFxfK+Cg41oZjdfogZ9JgwFYis0679bxUa6qqhc1E7f9JAqdj0ZQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626004162; a=rsa-sha256; cv=none; b=YzH1JyeGyXZJd23XC+djTzfrjDZt0vj/wGe5sfZgvG+eY1emNNOG14bACQgm1ySMxsGeou GkXmyh3asoFcVAHVSHU126g07Xo8sX8qiAU8+PyJLYzKWSC+IxYKHXTOu/YuwSzhB87SL2 7AKjzKEW8hPFSU8+IjS/1WDFpuY5JbqE7QmU1DzwaBuaKBIuS3m676LoaOKt9s8rdCrLIe r590w6b/L6qRlSTkZ01SSThXyX9xGxCKtXiH5Gtftgf+GImKHPnrZr3WxFM88knSdRpbZI 4PKuUr1ROoPimCgWl8j36kHJJYkWmDpleBv16tKGXMXjncULU6iGyDQ0O9yJ7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="AxtG/gz5"; 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: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="AxtG/gz5"; 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: CCB2C2A145 X-Spam-Score: 3.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: bjgja9ZM2BlN 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(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 8a8fcb59fd..0024709a96 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -40,6 +40,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) @@ -339,9 +340,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 "-")) @@ -365,7 +367,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")) @@ -375,9 +377,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" @@ -386,13 +388,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. @@ -424,7 +426,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 @@ -469,7 +471,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"))) @@ -492,9 +494,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" @@ -502,12 +504,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) @@ -532,7 +534,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 -- 2.32.0