From patchwork Fri Jun 18 16:09:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30380 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 565AF27BC81; Fri, 18 Jun 2021 17:14:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E3FF27BC78 for ; Fri, 18 Jun 2021 17:14:16 +0100 (BST) Received: from localhost ([::1]:46564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH8J-0006lo-4Q for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5G-0000L1-R2 for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46292) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5G-00027C-GJ for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5G-0002ye-CP for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 16/37] openssl: Remove trailing #t from phases. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11: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: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403264211183 (code B ref 49025); Fri, 18 Jun 2021 16:11:06 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:42 +0000 Received: from localhost ([127.0.0.1]:57783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4s-0002uC-Fb for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:42 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4V-0002qa-M2 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:20 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAKNH; Fri, 18 Jun 2021 18:10:19 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:15 +0200 Message-Id: <20210618160936.18972-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032619; bh=s5lvIzml+iEf2MhU975NrmAtyb33WbQYhk+vg+z1dIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=PN/QmjN0DUEL1rJLTyQa3aFANWcGEMdJzAOtl1Le+sYgX8R7Md4sMN7DYeN9UwIKM +v991vDfb34GhTUihKWa9IMRxjVNzu/54KSdc9eI/6y8mPgu1nrF85LiyQh33ECNa6 VgBfA0Fuw3bod8yOB523qAzYKvY8bw151X6PYPJIoC9tw0nCJ051zmXTm3SGYyvTnG xgPV1VDvia9xHuoCA1J08z6RzFsumt/w2L8LcSqrPh2Cy37WWw/mJQPqal8jy+sqOW UIMUmvjFfa5UtqBI+R+xXzL3A4z1m2Q9qMFvRpXTJ1D5ShoKf1y1/QvhtrBBcgEuHb KE33NFzbNrPBg== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl)[arguments]<#:phases>: Delete trailing #t. --- gnu/packages/tls.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 608a7d05b8..5bfc5545db 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -366,8 +366,7 @@ required structures.") ((string-prefix? "powerpc64" target) "linux-ppc64") ((string-prefix? "powerpc" target) - "linux-ppc"))) - #t))) + "linux-ppc")))))) '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -406,8 +405,7 @@ required structures.") (for-each (lambda (file) (install-file file slib) (delete-file file)) - (find-files lib "\\.a$")) - #t))) + (find-files lib "\\.a$"))))) (add-after 'install 'move-extra-documentation (lambda* (#:key outputs #:allow-other-keys) ;; Move man3 pages and full HTML documentation to "doc". @@ -420,8 +418,7 @@ required structures.") (copy-recursively man3 man-target) (delete-file-recursively man3) (copy-recursively html html-target) - (delete-file-recursively html) - #t))) + (delete-file-recursively html)))) (add-after 'install 'remove-miscellany (lambda* (#:key outputs #:allow-other-keys) @@ -430,8 +427,7 @@ required structures.") (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" ,(package-version this-package) - "/misc")) - #t)))))) + "/misc")))))))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR")