From patchwork Mon Apr 17 22:17:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 49275 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 674B617969; Mon, 17 Apr 2023 23:33:22 +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,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 81C581790F for ; Mon, 17 Apr 2023 23:33:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poXPE-0006St-1g; Mon, 17 Apr 2023 18:33:04 -0400 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 1poXPC-0006Sf-Qe for guix-patches@gnu.org; Mon, 17 Apr 2023 18:33:02 -0400 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 1poXPC-0004X8-IL for guix-patches@gnu.org; Mon, 17 Apr 2023 18:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poXPB-0007gD-W4 for guix-patches@gnu.org; Mon, 17 Apr 2023 18:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62916] [PATCH core-updates 2/2] NOT WORKING gnu: p11-kit: switch to meson-build-system. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 22:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62916 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62916@debbugs.gnu.org Received: via spool by 62916-submit@debbugs.gnu.org id=B62916.168177075529449 (code B ref 62916); Mon, 17 Apr 2023 22:33:01 +0000 Received: (at 62916) by debbugs.gnu.org; 17 Apr 2023 22:32:35 +0000 Received: from localhost ([127.0.0.1]:57140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXOl-0007ev-Cs for submit@debbugs.gnu.org; Mon, 17 Apr 2023 18:32:35 -0400 Received: from planete-kraus.eu ([89.234.140.182]:40880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poXOj-0007el-Ak for 62916@debbugs.gnu.org; Mon, 17 Apr 2023 18:32:34 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 611debc8 for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:32:31 +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=k7BK7sVjdng7mefOKYTfErq009I=; b=N4MGxD VOzmX04o1hGtJfLOaTea4w6a8jv4q5P8LexZ249DOcl4ErVBPT1+N1BBqNxPmMwc ejBJXF63ONV5rE0zzicxcabk2yoX3+S5gmFEbnk5/oSjFHIH9hwy2zd/2ATTYqv+ XYMZqJpKLClXfmhK+7uIALn38dazBMBmu2KDA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3574237c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <62916@debbugs.gnu.org>; Mon, 17 Apr 2023 22:32:27 +0000 (UTC) Message-Id: <16c8a106c160315cef9c04287414e2788e8a87f2.1681770007.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 18 Apr 2023 00:17:30 +0200 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 * gnu/packages/tls.scm (p11-kit): Switch to meson build system. --- gnu/packages/tls.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d41efe23b0..eaa18b9064 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -150,12 +150,9 @@ (define-public p11-kit "download/" version "/p11-kit-" version ".tar.xz")) (sha256 (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq")))) - (build-system gnu-build-system) + (build-system meson-build-system) (native-inputs - (append (list pkg-config) - (if (hurd-target?) - (list autoconf automake gettext-minimal libtool) - '()))) + (list pkg-config)) (inputs (append (list libffi libtasn1) (if (hurd-target?) @@ -165,7 +162,7 @@ (define-public p11-kit (list #:configure-flags ;; Use the default certificates so that users such as flatpak ;; find them. See . - #~'("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt") + #~'("-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt") #:phases #~(modify-phases %standard-phases #$@(if (hurd-target?) #~((add-after 'unpack 'apply-hurd-patch @@ -178,15 +175,7 @@ (define patch (replace 'bootstrap (lambda _ (invoke "autoreconf" "-fiv")))) - #~()) - (add-before 'check 'prepare-tests - (lambda _ - ;; "test-runtime" expects XDG_RUNTIME_DIR to be set up - ;; and looks for .cache and other directories (only). - ;; For simplicity just drop it since it is irrelevant - ;; in the build container. - (substitute* "Makefile" - (("test-runtime\\$\\(EXEEXT\\)") ""))))))) + #~())))) (home-page "https://p11-glue.github.io/p11-glue/p11-kit.html") (synopsis "PKCS#11 library") (description