From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cGS0DRnH7mAnAQAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 13:14:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 6IRwCRnH7mAdLAAAB5/wlQ (envelope-from ) for ; Wed, 14 Jul 2021 11:14:33 +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 CEF8A139C8 for ; Wed, 14 Jul 2021 13:14:32 +0200 (CEST) Received: from localhost ([::1]:46594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3cqV-0001kJ-Rw for larch@yhetil.org; Wed, 14 Jul 2021 07:14:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3cq8-00013x-Uh for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3cq7-0000zz-D9 for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3cq7-0001Qe-9Q for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-expression. 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.16262612205300 (code B ref 49025); Wed, 14 Jul 2021 11:14:07 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jul 2021 11:13:40 +0000 Received: from localhost ([127.0.0.1]:43167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpf-0001NJ-3b for submit@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:40 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpQ-0001Jh-SP 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 UzDG2500W4wFxCU01zDQG4; Wed, 14 Jul 2021 13:13:24 +0200 From: Maxime Devos Date: Wed, 14 Jul 2021 13:12:58 +0200 Message-Id: <20210714111307.19324-14-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-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626261204; bh=JHdidYibbmla5GyzrkyF1oyuXoOo0MlYIgVGOuNjBkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D32wl16MqOg+KGXgXW89FyBTRvb85yg2nTfid/odJhDEVlo3GA6lg1HwutUTEQoik qz4cQSdNKojbbdly4pxEf+oX3HH/n0lxHpLHnfV8jA8AtbgPrDiU0K39DuIBnDEVO3 3FU9lk0+mbrqOWVTyZFRqQyQfcV9WmlPNalwY6M+Fy1aaZuUJJwcV7qrrq73CB0gu/ LCaXhPiLX4Tz3HjrRn4rUb9FoRFKGO18s3jq4sTUWAMhdKl8F12IuIhUkoxtuLSjb6 1/agvhHoA0NvydkN6jW+IvKSSZ6uEM6RfBBn3uHordjceCHCID5Naw0vOpfYq4CQwc ILm6sYneHKSNg== 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=1626261273; 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=LzxdOQYgoJf1YG3OgQvBkafSjSDDm2VuDdyG1CfMPRRjF5osfSHo5zJXpHjyLEpPDoTxlc wlpg9vQTYDFXgEWyZRoDtvsn93q637fQRg4n9eMGK8eMpXsv3j16hhy61nYnF8P4QQAEsQ rYZVXmttnZmh2aYRft19fi67UtpG6nGVK9SDsiiRqj+Ekk7aJxt6Yff0ZB6+VEbZnizpM1 ws83MmIuZPS6Ob1NyJ8rrzDhNAbk6zuISzY7dqI6iq6Or3N/kCNx43x24DDHq6WjfNCWaq c+YKZU/v6Knrz62Y4oC+i8iPmuzOVrW+MleYnU62up/1UXiDWubTdF88jea41g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626261273; a=rsa-sha256; cv=none; b=LRXuf0gkX+ZiJ50X7dgUOGYyh/iNAcHHgYqQQSAnEnr0+wGSjzg7A4ieNNurh3sNa5p76j FtPrrgrOGPBtmOVb2GdA+yM8S2A8Q1rA3Di26EXUJVclzKSwuqqXbW9aEQA+WcuxIfJ6Dx JTfEPkkyf0xGRU1j8K3bf2IISy/8TSayOHf5n9R5uE2WGVRUm08FCFOXu73ou1pEz4PCik vESm5ueZ+XTk9+GEu2SHCCt/VP01G6l48RnFA07zSNQbJ48vNExjrYVIB0iYMM2kgByRXp 5IAaAXB1ernK/CNZhToumUJzxYBpKCgD++yq4Nz51t3DYVJhHeeula45fgPiUQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=D32wl16M; 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.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=D32wl16M; 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: CEF8A139C8 X-Spam-Score: 3.70 X-Migadu-Scanner: scn1.migadu.com X-TUID: ysmJ5XE/lCK/ 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