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 wPdvBSwIzmAXEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:07:24 +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 sIw/ASwIzmBZEAAAB5/wlQ (envelope-from ) for ; Sat, 19 Jun 2021 15:07:24 +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 73D3A21EA0 for ; Sat, 19 Jun 2021 17:07:23 +0200 (CEST) Received: from localhost ([::1]:52752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZ8-0001Df-8m for larch@yhetil.org; Sat, 19 Jun 2021 11:07:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucXy-000807-Dc for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucXy-0007vw-5W for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucXy-0005fc-0v for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 17/36] openssl: Make the #:phases argument a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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.162411514921536 (code B ref 49025); Sat, 19 Jun 2021 15:06:09 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:05:49 +0000 Received: from localhost ([127.0.0.1]:60378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXc-0005bB-Il for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:48 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX5-0005VF-Rl for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:17 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Fq5; Sat, 19 Jun 2021 17:05:15 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:39 +0200 Message-Id: <20210619150458.12057-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-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=1624115115; bh=Gcw+h2QCxdUe0ND+PEA3g+/inIceKw9xgBiDzndF/dA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=th0oDzkDoNSc+UZdlAdazaA/IjEBfeDSzkT31uP1D4WLi+MCdiCFbtWnOEhHpM5L/ KnwoM3C5d4oJw9j8VQluytaO2tljGRmVZxb5WyFFWgygmqRcYux3ukwP9gwRXqYJgl Rem7ksE/1FSOWMfyQfg4zhW+BNML6tNE7c7y3zo60lioDgNZZ98Pv7i5K0D0UDKUYx tC8kLkahrFcJr1UdCFgfmY8d4ylYnFpDNBBccguK/uCjoZ4y3Q/Pwf+J6Hg0PsMRRT aJx0V2RJOMORmDmryAUBjgdNdcpD95N78c7hdiml7lNnwXae4iXn3UB/NrbOKBblja Kw4ZBiIYIt2+g== 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=1624115243; 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=Gcw+h2QCxdUe0ND+PEA3g+/inIceKw9xgBiDzndF/dA=; b=Yx0zIJvxjZLvaPDgdQHAWT8G2Zl3mkGnAjRXl5ajKagsAs1gJuNJx5IjR2WNYx+xdZnHed T4U4Es1a8uIUEO9vPXoxB1kKO3atAsSXoyHeTZzehX8gF5kF7z0chzssDzp1zUSVYFctI7 mKRorAv+thVGAZMC8Nx9PzMFzplo0E6OTFO2u6WNE0xt66CeV/sNIvfSgdAR6XI2HvbuIc qQ2lHx3ISyXH/NkCKZ1kJrx+cjDKBEHqloK/qDOxCf8M9Q1BvDpFECwhJ/vOEpZvy6IGba qY7YaI+zAPY4NN1Kc5ztltbQfYI5aVLJJaxSIH1e/ab2CVqG+4xY+8uDzRRgRg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115243; a=rsa-sha256; cv=none; b=pDkiDlU0Zv9rWYWbX4HuLYm3a0dNEXL3N7zHP7cXLtkRQva/Et8SOaiX/wnKhIvzasreii 30Nq4AtxAmKccnnVo4nLz+Hmrv0lgGRLsXzi5eOLvnXepHhglTA/Voq6iC/Vd08LtYravb bemUBnUgF1LX1GocmM6lIMz2CEmekoXdE2XyYI91tu7aQR5P/meqczMHuAL6hlRzUrnAex XxNjwWiMEaXwnyy246qXBDYUA1vUEyS6vh34wvy6gdm9cDHXbI53jnWn9L5y/MTuVqpIBx fVnIYb0m0Ow45WTmByY1fctUiWiyLWOF67drxm2q8TZOxQ5BmsNonf+u1k7fxQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=th0oDzkD; 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.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=th0oDzkD; 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: 73D3A21EA0 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: aSAok3SbVJ04 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 3688449efe..f561c28251 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -39,6 +39,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) @@ -338,9 +339,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 "-")) @@ -364,7 +366,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")) @@ -374,9 +376,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" @@ -385,13 +387,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. @@ -423,7 +425,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 @@ -468,7 +470,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"))) @@ -491,9 +493,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" @@ -501,12 +503,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) @@ -531,7 +533,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