From patchwork Sat May 7 08:37:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 39135 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 C4FCD27BBEA; Sat, 7 May 2022 09:39:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8FF5B27BBE9 for ; Sat, 7 May 2022 09:39:16 +0100 (BST) Received: from localhost ([::1]:47878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnFy7-00039w-NF for patchwork@mira.cbaines.net; Sat, 07 May 2022 04:39:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnFww-00023R-LI for guix-patches@gnu.org; Sat, 07 May 2022 04:38:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnFww-0002kD-CU for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnFww-0003pz-7u for guix-patches@gnu.org; Sat, 07 May 2022 04:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55297] [PATCH 04/10] gnu: cmake-bootstrap: Use $SSL_CERT_DIR/$SSL_CERT_FILE. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 08:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55297 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55297@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 55297-submit@debbugs.gnu.org id=B55297.165191266614646 (code B ref 55297); Sat, 07 May 2022 08:38:02 +0000 Received: (at 55297) by debbugs.gnu.org; 7 May 2022 08:37:46 +0000 Received: from localhost ([127.0.0.1]:50377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwg-0003o9-7x for submit@debbugs.gnu.org; Sat, 07 May 2022 04:37:46 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:44066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnFwe-0003nS-0s for 55297@debbugs.gnu.org; Sat, 07 May 2022 04:37:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id Tkdi270084UW6Th06kdiWX; Sat, 07 May 2022 10:37:43 +0200 From: Maxime Devos Date: Sat, 7 May 2022 08:37:34 +0000 Message-Id: <20220507083740.59995-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220507083740.59995-1-maximedevos@telenet.be> References: <20220507083740.59995-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1651912663; bh=r59z4C4S5og93a9b/FPqoM1NpwD0hbNhzw6O7v1vJuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XK8qlP8MXW7+JvF70ziDgKwynrm1uRHswqSzPG9ecc3cUss95KJCQg6QdRlTVRmEt a60VUjI8zw/E1CH8WN7KjOAVkMidK5/rdJWq1HMnZ85t11B05HbjVB2T36JphZNjmC bRm6CL9hDDPfMd3Nb2VUFtauY3f1Mr0VAGYvBFVAC+oH71m96a3V84cw0CVEwAF6VD x2IAN8oTA8IAuglOhMTGdZ6DOnMV5jfSKmm8wAWhTFKVtOZbYH7IFUw+OUZ/7yBv2r JTSfanGFKJiX54z85PK2z6JpYrU41+SA94mxJE2AAgpcSma4ZKlJiCVp9RTFBpth9/ FpXBF+Oaywn0Q== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cmake.scm (cmake-bootstrap)[native-search-paths]: Use the $SSL_CERT_DIR/$SSL_CERT_FILE from (guix search-paths) instead of a local copy. --- gnu/packages/cmake.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 4207f14310..cf930c57fc 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -38,6 +38,7 @@ (define-module (gnu packages cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) @@ -229,15 +230,8 @@ (define-public cmake-bootstrap (files '(""))) ;; "cmake-curl-certificates.patch" changes CMake to honor 'SSL_CERT_DIR' ;; and 'SSL_CERT_FILE', hence these search path entries. - (search-path-specification - (variable "SSL_CERT_DIR") - (separator #f) ;single entry - (files '("etc/ssl/certs"))) - (search-path-specification - (variable "SSL_CERT_FILE") - (file-type 'regular) - (separator #f) ;single entry - (files '("etc/ssl/certs/ca-certificates.crt"))))) + $SSL_CERT_DIR + $SSL_CERT_FILE)) (home-page "https://cmake.org/") (synopsis "Cross-platform build system") (description