From patchwork Fri Jan 6 22:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45892 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 9B7EC27BBEB; Fri, 6 Jan 2023 23:02:20 +0000 (GMT) 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,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 F307427BBE9 for ; Fri, 6 Jan 2023 23:02:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDvj1-0003uD-BK; Fri, 06 Jan 2023 18:02:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDvit-0003rW-CG for guix-patches@gnu.org; Fri, 06 Jan 2023 18:02:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDvit-0001mP-3T for guix-patches@gnu.org; Fri, 06 Jan 2023 18:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDvis-0006eq-U4 for guix-patches@gnu.org; Fri, 06 Jan 2023 18:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60586] [PATCH v2 2/2] gnu: p11-kit-next: Switch to meson-build-system. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Jan 2023 23:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60586@debbugs.gnu.org Received: via spool by 60586-submit@debbugs.gnu.org id=B60586.167304608825544 (code B ref 60586); Fri, 06 Jan 2023 23:02:02 +0000 Received: (at 60586) by debbugs.gnu.org; 6 Jan 2023 23:01:28 +0000 Received: from localhost ([127.0.0.1]:56042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDviK-0006dw-8O for submit@debbugs.gnu.org; Fri, 06 Jan 2023 18:01:28 -0500 Received: from planete-kraus.eu ([89.234.140.182]:35106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDviI-0006do-97 for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 18:01:27 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 66c4fe40 for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=sxL8gKuDMD66bk1ql34H3/mLJ9o=; b=CHg8To 6AGHFial6MVGAF27i5ctIQAR1BCCTdNLjzhAURYIeEkWLhjsZHv/5uLaZwBcRH+v FABGM2SAslpLI52h+2Ch2B63xjNi5yBC4KaS1kyfuiuzmTQi9W05nK5UL1IZip55 zxNeKWN5rrxgUlUh+CEhuj6rbAuah1OkpHfLg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id cac83b72 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:01:22 +0000 (UTC) Message-Id: In-Reply-To: References: Date: Fri, 6 Jan 2023 23:48:21 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches README.md says to use meson to build. * gnu/packages/tls.scm (p11-kit-next): Use meson-build-system. --- gnu/packages/tls.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..a5c8ec1624 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -51,6 +51,7 @@ (define-module (gnu packages tls) #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system trivial) + #:use-module (guix build-system meson) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages compression) #:use-module (gnu packages) @@ -205,12 +206,16 @@ (define-public p11-kit-next "download/" version "/p11-kit-" version ".tar.xz")) (sha256 (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) + (build-system meson-build-system) (arguments ;; Use the default certificates so that users such as flatpak find them. ;; See . (substitute-keyword-arguments (package-arguments p11-kit) ((#:configure-flags flags ''()) - ''("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt")))))) + ''("-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt")) + ;; p11-kit is still on gnu-build-system. + ((#:phases gnu-phases) + '%standard-phases))))) (define-public gnutls (package