From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 62916@debbugs.gnu.org
Subject: [bug#62916] [PATCH core-updates 2/2] NOT WORKING gnu: p11-kit: switch to meson-build-system.
Date: Tue, 18 Apr 2023 00:17:30 +0200 [thread overview]
Message-ID: <16c8a106c160315cef9c04287414e2788e8a87f2.1681770007.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1681770007.git.vivien@planete-kraus.eu>
* 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 <https://issues.guix.gnu.org/49957>.
- #~'("--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
--
2.39.2
prev parent reply other threads:[~2023-04-17 22:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 22:20 [bug#62916] [PATCH core-updates 0/2] Try to fix p11-kit compilation to mingw Vivien Kraus via Guix-patches via
2023-04-17 22:09 ` [bug#62916] [PATCH core-updates 1/2] gnu: gcc: do not build gcov Vivien Kraus via Guix-patches via
2023-04-25 16:11 ` [bug#62916] [PATCH core-updates 0/2] Try to fix p11-kit compilation to mingw Ludovic Courtès
2023-04-25 16:16 ` [bug#62916] [PATCH v2 0/1] Fix p11-kit build system for mingw Vivien Kraus via Guix-patches via
2023-04-25 15:50 ` [bug#62916] [PATCH v2 1/1] gnu: p11-kit: fix build on mingw Vivien Kraus via Guix-patches via
2023-04-25 21:33 ` [bug#62916] [PATCH v3 0/1] Simpler fix for p11-kit@mingw Vivien Kraus via Guix-patches via
2023-04-25 15:50 ` [bug#62916] [PATCH v3 1/1] gnu: p11-kit: fix build on mingw Vivien Kraus via Guix-patches via
2023-04-17 22:17 ` Vivien Kraus via Guix-patches via [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16c8a106c160315cef9c04287414e2788e8a87f2.1681770007.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=62916@debbugs.gnu.org \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).