From unknown Thu Jun 19 14:03:41 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#60586 <60586@debbugs.gnu.org> To: bug#60586 <60586@debbugs.gnu.org> Subject: Status: [PATCH 0/1] Fix p11-kit for mingw Reply-To: bug#60586 <60586@debbugs.gnu.org> Date: Thu, 19 Jun 2025 21:03:41 +0000 retitle 60586 [PATCH 0/1] Fix p11-kit for mingw reassign 60586 guix-patches submitter 60586 Vivien Kraus severity 60586 normal tag 60586 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 05 18:35:37 2023 Received: (at submit) by debbugs.gnu.org; 5 Jan 2023 23:35:37 +0000 Received: from localhost ([127.0.0.1]:53274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDZlp-0007SN-9s for submit@debbugs.gnu.org; Thu, 05 Jan 2023 18:35:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:40214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDZlo-0007SH-1O for submit@debbugs.gnu.org; Thu, 05 Jan 2023 18:35:36 -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 1pDZln-0007bU-Kj for guix-patches@gnu.org; Thu, 05 Jan 2023 18:35:35 -0500 Received: from planete-kraus.eu ([2a00:5881:4008:2810::309]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pDZlk-0004Ow-SR for guix-patches@gnu.org; Thu, 05 Jan 2023 18:35:35 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b5a5197b for ; Thu, 5 Jan 2023 23:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=4BwcRyq 9Q70hq4AfGkrGLnoJvHA=; b=PH5qThCoMjib3uyrllxEId6jJlqMgJ6Tyj/iH9s 2QvUsLgVYI18H6co+uPtHxgMRxbEdGg+kxLFOVA69BuQK8uP9davLlwlKi7r+zH0 isRTgxb3LCZsT7benxjt9UPvDR81ekffBHWn5UUvRPOzOlM/vf5ePEwkWxXbG27M jJf0= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c0c66ad7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Thu, 5 Jan 2023 23:35:18 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Fri, 6 Jan 2023 00:32:45 +0100 Subject: [PATCH 0/1] Fix p11-kit for mingw To: guix-patches@gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Dear guix, I think I managed to get p11-kit to build for mingw. I am not sure that everything is correct, because gnutls still fails to build, and I don’t understand why. Could someone help me with this? Best regards, Vivien Vivien Kraus (1): gnu: p11-kit: Fix mingw cross-compilation. gnu/local.mk | 1 + gnu/packages/patches/p11-kit-fix-mingw.patch | 92 ++++++++++++++++++++ gnu/packages/tls.scm | 22 ++++- 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/p11-kit-fix-mingw.patch base-commit: 6f8a03fad32261b6d4b38991f6757fb0bcc4bd86 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 05 18:37:21 2023 Received: (at 60586) by debbugs.gnu.org; 5 Jan 2023 23:37:21 +0000 Received: from localhost ([127.0.0.1]:53279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDZnU-0007VE-O5 for submit@debbugs.gnu.org; Thu, 05 Jan 2023 18:37:21 -0500 Received: from planete-kraus.eu ([89.234.140.182]:40590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDZnT-0007V6-06 for 60586@debbugs.gnu.org; Thu, 05 Jan 2023 18:37:19 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e8bc3fd0 for <60586@debbugs.gnu.org>; Thu, 5 Jan 2023 23:37:17 +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=BNdS2snVBottrkDAPpXLuznoKSw=; b=PctVoY MDhJ6FGlLYEOiNgxqgSxqtd7yS84b2tg3iph+2iXrnLIctyTRkSXZZ1QcxB5sfTU JS+fgSga+zT4pnN5if/k+uuJBoogRocLs/h4p6/4pKeVvnaIPZYmV5jy0/zD0c4X 6ySFvpQdNKFxIF/Z4fDICL5kXHzH3Q1ksPdsU= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 29ec553e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Thu, 5 Jan 2023 23:37:14 +0000 (UTC) Message-Id: <20f2359427de9bfa0cdaccfed5b1b4a0f24a01b6.1672961565.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Thu, 5 Jan 2023 23:08:18 +0100 Subject: [PATCH 1/1] gnu: p11-kit: Fix mingw cross-compilation. To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/p11-kit-fix-mingw.patch: New patch. It removes undefined symbol errors. * gnu/packages/tls.scm (p11-kit) [native-inputs]: Add libtasn1 as a dependency for a code generator. The autotools are added when compiling for mingw. [inputs]: Add the mingw patch, similar to the hurd patch. [phases]: Add a new apply-mingw-patch phase, similar to apply-hurd-patch. The 'bootstrap phase replacement happens both for hurd and mingw. --- gnu/local.mk | 1 + gnu/packages/patches/p11-kit-fix-mingw.patch | 92 ++++++++++++++++++++ gnu/packages/tls.scm | 22 ++++- 3 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/p11-kit-fix-mingw.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4a94c3b8c8..a35c2d2f33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1649,6 +1649,7 @@ dist_patch_DATA = \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ %D%/packages/patches/sunxi-tools-remove-sys-io.patch \ + %D%/packages/patches/p11-kit-fix-mingw.patch \ %D%/packages/patches/p11-kit-hurd.patch \ %D%/packages/patches/patch-hurd-path-max.patch \ %D%/packages/patches/perl-5.14-autosplit-default-time.patch \ diff --git a/gnu/packages/patches/p11-kit-fix-mingw.patch b/gnu/packages/patches/p11-kit-fix-mingw.patch new file mode 100644 index 0000000000..cfb8a3c9ba --- /dev/null +++ b/gnu/packages/patches/p11-kit-fix-mingw.patch @@ -0,0 +1,92 @@ +From de5a3522cc7dd28d9b12f26ad29803ae623dcf24 Mon Sep 17 00:00:00 2001 +From: Vivien Kraus +Date: Thu, 5 Jan 2023 22:56:35 +0100 +Subject: [PATCH] Make sure that libp11-kit does not have undefined symbols + +Under mingw, as a DLL, libp11-kit is not allowed to have undefined +symbols. It means that it should also add the COMMON_LIBS in addition +to the internal library. + +The programs must do that too, otherwise they have undefined symbols. +--- + p11-kit/Makefile.am | 13 ++++++++++--- + trust/Makefile.am | 3 ++- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am +index 7fe7a6c..11ec3da 100644 +--- a/p11-kit/Makefile.am ++++ b/p11-kit/Makefile.am +@@ -237,6 +237,8 @@ EXTRA_DIST += \ + + bin_PROGRAMS += p11-kit/p11-kit + ++p11_kit_p11_kit_CFLAGS = $(COMMON_CFLAGS) ++ + p11_kit_p11_kit_SOURCES = \ + p11-kit/lists.c \ + p11-kit/p11-kit.c \ +@@ -244,8 +246,9 @@ p11_kit_p11_kit_SOURCES = \ + + p11_kit_p11_kit_LDADD = \ + libp11-kit.la \ ++ libp11-kit-internal.la \ + libp11-tool.la \ +- libp11-common.la \ ++ $(COMMON_LIBS) \ + $(LTLIBINTL) \ + $(NULL) + +@@ -257,12 +260,14 @@ private_PROGRAMS += p11-kit/p11-kit-remote + + p11_kit_p11_kit_remote_SOURCES = \ + p11-kit/remote.c \ ++ $(libp11_kit_la_SOURCES) \ + $(NULL) + + p11_kit_p11_kit_remote_LDADD = \ + libp11-tool.la \ +- libp11-common.la \ + libp11-kit.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(NULL) + + check_PROGRAMS += p11-kit/p11-kit-remote-testable +@@ -278,12 +283,14 @@ private_PROGRAMS += p11-kit/p11-kit-server + + p11_kit_p11_kit_server_SOURCES = \ + p11-kit/server.c \ ++ $(libp11_kit_la_SOURCES) \ + $(NULL) + + p11_kit_p11_kit_server_LDADD = \ + libp11-tool.la \ +- libp11-common.la \ + libp11-kit.la \ ++ libp11-kit-internal.la \ ++ $(COMMON_LIBS) \ + $(LIBSYSTEMD_LIBS) \ + $(NULL) + +diff --git a/trust/Makefile.am b/trust/Makefile.am +index 6ff5d12..4e99a80 100644 +--- a/trust/Makefile.am ++++ b/trust/Makefile.am +@@ -85,11 +85,12 @@ bin_PROGRAMS += trust/trust + trust_trust_LDADD = \ + libtrust-data.la \ + libp11-kit.la \ +- libp11-common.la \ ++ libp11-kit-internal.la \ + libp11-tool.la \ + $(LTLIBINTL) \ + $(LIBTASN1_LIBS) \ + $(HASH_LIBS) \ ++ $(COMMON_LIBS) \ + $(NULL) + + trust_trust_CFLAGS = \ +-- +2.38.1 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a74b423ccf..d4220284e8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -148,11 +148,13 @@ (define-public p11-kit (base32 "1dn6br4v033d3gp2max9lsr3y4q0nj6iyr1yq3kzi8ym7lal13wa")))) (build-system gnu-build-system) (native-inputs - `(,@(if (hurd-target?) + `(,@(if (or (hurd-target?) (target-mingw?)) `(("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ;for autopoint - ("libtool" ,libtool)) + ("libtool" ,libtool) + ;libtasn1 is a code generator + ("libtasn1" ,libtasn1)) '()) ("pkg-config" ,pkg-config))) (inputs @@ -161,6 +163,9 @@ (define-public p11-kit `(("libbsd" ,libbsd) ("hurd-patch" ,(search-patch "p11-kit-hurd.patch"))) '()) + ,@(if (target-mingw?) + `(("mingw-patch" ,(search-patch "p11-kit-fix-mingw.patch"))) + '()) ("libtasn1" ,libtasn1))) (arguments `(#:configure-flags '("--without-trust-paths") @@ -170,8 +175,17 @@ (define-public p11-kit (lambda* (#:key inputs #:allow-other-keys) (let ((patch (assoc-ref inputs "hurd-patch"))) (invoke "patch" "-p1" "--batch" "-i" - patch)))) - (replace 'bootstrap + patch))))) + '()) + ,@(if (target-mingw?) + '((add-after 'unpack 'apply-mingw-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "mingw-patch"))) + (invoke "patch" "-p1" "--batch" "-i" + patch))))) + '()) + ,@(if (or (hurd-target?) (target-mingw?)) + '((replace 'bootstrap (lambda _ (invoke "autoreconf" "-fiv")))) '()) -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 18:00:58 2023 Received: (at 60586) by debbugs.gnu.org; 6 Jan 2023 23:00:58 +0000 Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvhq-0006cW-Dw for submit@debbugs.gnu.org; Fri, 06 Jan 2023 18:00:58 -0500 Received: from planete-kraus.eu ([89.234.140.182]:34612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvhp-0006cO-5g for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 18:00:57 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 6837f296 for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=WCtBxa+ lZZKrMufS8MQH4IcQItE=; b=BdvUNFhWcTkzQ8Q4d5X9GBGfQqsSQbwsK0uk5Dw 7M0wrGf1LxnPS0tngmRUyMd7eB9qEgxkBq/MwzS0+mBb3+owA+/D7lyZHVfE9Q3c e8+U16LOth+fA5op0IkDOUVZZ0IEhuzOkeNjNakY3qi/i5+89ZtHGl+gLWqE17Gf 5CUQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 6891b625 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:00:51 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Fri, 6 Jan 2023 23:55:32 +0100 Subject: [PATCH v2 0/2] Switch p11-kit-next to meson-build-system To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dear guix, Upstream recommends to build with meson (see README.md), and it happens to solve the mingw cross-compilation failure. I had to isolate meson from the other build tools, because one of the package in (gnu packages build-tools) depends on openssl, which is in (gnu packages tls) like p11-kit. So, using the meson build system would be a circular dependency. Since now meson has quite a few public variables, I figured out it could go to its own file. I had to read the git log twice to make sure I got the correct copyright notices (including dates) for both meson-related stuff and the other packages in (gnu packages build-tools). Vivien Kraus (2): gnu: move meson to (gnu packages meson). gnu: p11-kit-next: Switch to meson-build-system. gnu/local.mk | 1 + gnu/packages/build-tools.scm | 169 ++--------------------- gnu/packages/freedesktop.scm | 3 +- gnu/packages/geo.scm | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/meson.scm | 204 ++++++++++++++++++++++++++++ gnu/packages/package-management.scm | 1 + gnu/packages/python-science.scm | 1 + gnu/packages/syndication.scm | 1 + gnu/packages/tls.scm | 7 +- gnu/packages/virtualization.scm | 1 + guix/build-system/meson.scm | 2 +- 12 files changed, 230 insertions(+), 162 deletions(-) create mode 100644 gnu/packages/meson.scm base-commit: cce9ff2d5ada3d1e26e1c70205f21271a0065482 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 18:01:11 2023 Received: (at 60586) by debbugs.gnu.org; 6 Jan 2023 23:01:11 +0000 Received: from localhost ([127.0.0.1]:56039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvi1-0006dN-Pk for submit@debbugs.gnu.org; Fri, 06 Jan 2023 18:01:11 -0500 Received: from planete-kraus.eu ([89.234.140.182]:34612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvhy-0006cO-Eo for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 18:01:08 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f24d22d8 for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:01:05 +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=7cQi29v4u80yfsq5QvLdk/nA83Y=; b=kPZqQe c+eQkAqt+90OeO2kAYVwjjz2Bu1HsAqcLpXyXRKQRrYqPZqIrnf/368QVArklF/r 7r2IQsE2d6RGn6/Ic1pT9yz8JyR5+z04EYeQdjvIWl64/rsqcAS74bggamhXo5Tr 6sCU0YRWvfHRAzDvA2v4ZvAtEcOH94xJ43vB8= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f6c2018e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:01:05 +0000 (UTC) Message-Id: <28f09f45f5ded05a459aafac932207a28e4d27d3.1673045732.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Fri, 6 Jan 2023 22:04:48 +0100 Subject: [PATCH v2 1/2] gnu: move meson to (gnu packages meson). To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/meson.scm: New file with meson. * gnu/packages/build-tools.scm (meson-0.63, meson-0.60 meson-0.59 meson meson-python): Move to (gnu packages meson). * gnu/packages/freedesktop.scm, gnu/packages/geo.scm, gnu/packages/gnome.scm, gnu/packages/package-management.scm, gnu/packages/python-science.scm, gnu/packages/syndication.scm, gnu/packages/virtualization.scm: import (gnu packages meson). * guix/build-system/meson.scm (default-meson): get it from (gnu packages meson). --- gnu/local.mk | 1 + gnu/packages/build-tools.scm | 169 ++--------------------- gnu/packages/freedesktop.scm | 3 +- gnu/packages/geo.scm | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/meson.scm | 204 ++++++++++++++++++++++++++++ gnu/packages/package-management.scm | 1 + gnu/packages/python-science.scm | 1 + gnu/packages/syndication.scm | 1 + gnu/packages/virtualization.scm | 1 + guix/build-system/meson.scm | 2 +- 11 files changed, 224 insertions(+), 161 deletions(-) create mode 100644 gnu/packages/meson.scm diff --git a/gnu/local.mk b/gnu/local.mk index 325bdd570a..ccf225efbb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -419,6 +419,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/medical.scm \ %D%/packages/mercury.scm \ %D%/packages/mes.scm \ + %D%/packages/meson.scm \ %D%/packages/messaging.scm \ %D%/packages/minetest.scm \ %D%/packages/mingw.scm \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 6c1350c44f..e61db21325 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -1,10 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018 Ricardo Wurmus -;;; Copyright © 2017 Corentin Bocquillon -;;; Copyright © 2017–2021 Tobias Geerinckx-Rice +;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Tomáš Čech -;;; Copyright © 2018, 2020 Marius Bakke +;;; Copyright © 2018-2022 Tobias Geerinckx-Rice +;;; Copyright © 2018-2022 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier @@ -12,9 +12,14 @@ ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2021 qblade -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Léo Le Bouter +;;; Copyright © 2021, 2022 Greg Hogan +;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2022 Juliana Sims +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -273,160 +278,6 @@ (define-public gn ;; X11 license. (license (list license:bsd-3 license:x11))))) -(define-public meson-0.63 - (package - (name "meson") - (version "0.63.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "1gwba75z47m2hv3w08gw8sgqgbknjr7rj1qwr510bgknxwbjy8hn")))) - (build-system python-build-system) - (arguments - `(;; FIXME: Tests require many additional inputs and patching many - ;; hard-coded file system locations in "run_unittests.py". - #:tests? #f - #:phases (modify-phases %standard-phases - ;; Meson calls the various executables in out/bin through the - ;; Python interpreter, so we cannot use the shell wrapper. - (replace 'wrap - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((python-version - (python-version (assoc-ref inputs "python"))) - (output (assoc-ref outputs "out"))) - (substitute* (string-append output "/bin/meson") - (("# EASY-INSTALL-ENTRY-SCRIPT") - (format #f "\ -import sys -sys.path.insert(0, '~a/lib/python~a/site-packages') -# EASY-INSTALL-ENTRY-SCRIPT" - output python-version))))))))) - (inputs (list python-wrapper ninja)) - (home-page "https://mesonbuild.com/") - (synopsis "Build system designed to be fast and user-friendly") - (description - "The Meson build system is focused on user-friendliness and speed. -It can compile code written in C, C++, Fortran, Java, Rust, and other -languages. Meson provides features comparable to those of the -Autoconf/Automake/make combo. Build specifications, also known as @dfn{Meson -files}, are written in a custom domain-specific language (@dfn{DSL}) that -resembles Python.") - (license license:asl2.0))) - -(define-public meson-0.60 - (package - (inherit meson-0.63) - (version "0.60.3") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "13mrrizg4vl6n5k7fz6amyafnn3i097dcarr552qc0ca6nlmzjl7")) - (patches (search-patches - "meson-allow-dirs-outside-of-prefix.patch")))))) - -;;; This older Meson variant is kept for now for gtkmm and others that may -;;; have problems with 0.60. -(define-public meson-0.59 - (package - (inherit meson-0.60) - (version "0.59.4") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mesonbuild/meson/" - "releases/download/" version "/meson-" - version ".tar.gz")) - (sha256 - (base32 - "117cm8794h291lca1wljz1pwnzidgbvrpg3mw3np6ksma368hyd7")) - (patches (search-patches - "meson-allow-dirs-outside-of-prefix.patch")))))) - -;; TODO: Bump this in the next rebuild cycle. -(define-public meson meson-0.60) - -(define-public meson-python - (package - (name "meson-python") - (version "0.8.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "meson_python" version)) - (sha256 - (base32 - "0k2yn0iws1n184sdznzmfw4xgbqgq5cn02hpc7m0xdaxryj1ybs4")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'avoid-ninja-dependency - (lambda _ - ;; Avoid dependency on the "ninja" PyPI distribution, - ;; which is a meta-package that simply downloads and - ;; installs ninja from the web ... - (substitute* "pyproject.toml" - (("'ninja',") - "")))) - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "tests" "-k" - (string-append - "not " - ;; These tests require a git checkout. - (string-join '("test_contents_unstaged" - "test_no_pep621" - "test_pep621" - "test_dynamic_version" - "test_contents" - "test_contents_subdirs") - " and not "))))))))) - (propagated-inputs - (list meson-0.63 ;>=0.62 required - ninja - ;; XXX: python-meson forcefully sets the RUNPATH of binaries - ;; for vendoring purposes, and uses PatchELF for that(!). This - ;; functionality is not useful in Guix, but removing this - ;; dependency is tricky. There is discussion upstream about making - ;; it optional, but for now we'll just carry it: - ;; https://github.com/FFY00/meson-python/issues/125 - patchelf - python-colorama - python-pyproject-metadata - python-tomli - python-wheel)) - (native-inputs - (list python-pypa-build - python-wheel - - ;; For tests. - pkg-config - python-gitpython - python-pytest - python-pytest-mock)) - (home-page "https://github.com/FFY00/mesonpy") - (synopsis "Meson-based build backend for Python") - (description - "meson-python is a PEP 517 build backend for Meson projects.") - (license license:expat))) - (define-public premake4 (package (name "premake") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 515d9b9cea..b442ec8ab7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -103,8 +103,9 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) - #:use-module (gnu packages man) #:use-module (gnu packages m4) + #:use-module (gnu packages man) + #:use-module (gnu packages meson) #:use-module (gnu packages networking) #:use-module (gnu packages nss) #:use-module (gnu packages package-management) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 2185af7a98..5fbe6f8dd7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -99,6 +99,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages meson) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47a0f237fe..3774b9af9f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -162,6 +162,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages mail) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages meson) #:use-module (gnu packages messaging) #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) diff --git a/gnu/packages/meson.scm b/gnu/packages/meson.scm new file mode 100644 index 0000000000..c42e13cf2a --- /dev/null +++ b/gnu/packages/meson.scm @@ -0,0 +1,204 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2017 Corentin Bocquillon +;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2017 Peter Mikkelsen +;;; Copyright © 2018-2022 Marius Bakke +;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Brett Gilio +;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2021, 2022 Maxim Cournoyer +;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Sou Bunnbu (宋文武) +;;; Copyright © 2021 Kaelyn Takata +;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2021 Vivien Kraus +;;; Copyright © 2021 Ludovic Courtès +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages meson) + #:use-module (ice-9 optargs) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix modules) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages elf) + #:use-module (gnu packages ninja) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages version-control)) + +(define-public meson-0.63 + (package + (name "meson") + (version "0.63.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "1gwba75z47m2hv3w08gw8sgqgbknjr7rj1qwr510bgknxwbjy8hn")))) + (build-system python-build-system) + (arguments + `(;; FIXME: Tests require many additional inputs and patching many + ;; hard-coded file system locations in "run_unittests.py". + #:tests? #f + #:phases (modify-phases %standard-phases + ;; Meson calls the various executables in out/bin through the + ;; Python interpreter, so we cannot use the shell wrapper. + (replace 'wrap + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((python-version + (python-version (assoc-ref inputs "python"))) + (output (assoc-ref outputs "out"))) + (substitute* (string-append output "/bin/meson") + (("# EASY-INSTALL-ENTRY-SCRIPT") + (format #f "\ +import sys +sys.path.insert(0, '~a/lib/python~a/site-packages') +# EASY-INSTALL-ENTRY-SCRIPT" + output python-version))))))))) + (inputs (list python-wrapper ninja)) + (home-page "https://mesonbuild.com/") + (synopsis "Build system designed to be fast and user-friendly") + (description + "The Meson build system is focused on user-friendliness and speed. +It can compile code written in C, C++, Fortran, Java, Rust, and other +languages. Meson provides features comparable to those of the +Autoconf/Automake/make combo. Build specifications, also known as @dfn{Meson +files}, are written in a custom domain-specific language (@dfn{DSL}) that +resembles Python.") + (license license:asl2.0))) + +(define-public meson-0.60 + (package + (inherit meson-0.63) + (version "0.60.3") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "13mrrizg4vl6n5k7fz6amyafnn3i097dcarr552qc0ca6nlmzjl7")) + (patches (search-patches + "meson-allow-dirs-outside-of-prefix.patch")))))) + +;;; This older Meson variant is kept for now for gtkmm and others that may +;;; have problems with 0.60. +(define-public meson-0.59 + (package + (inherit meson-0.60) + (version "0.59.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "117cm8794h291lca1wljz1pwnzidgbvrpg3mw3np6ksma368hyd7")) + (patches (search-patches + "meson-allow-dirs-outside-of-prefix.patch")))))) + +;; TODO: Bump this in the next rebuild cycle. +(define-public meson meson-0.60) + +(define-public meson-python + (package + (name "meson-python") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "meson_python" version)) + (sha256 + (base32 + "0k2yn0iws1n184sdznzmfw4xgbqgq5cn02hpc7m0xdaxryj1ybs4")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'avoid-ninja-dependency + (lambda _ + ;; Avoid dependency on the "ninja" PyPI distribution, + ;; which is a meta-package that simply downloads and + ;; installs ninja from the web ... + (substitute* "pyproject.toml" + (("'ninja',") + "")))) + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests" "-k" + (string-append + "not " + ;; These tests require a git checkout. + (string-join '("test_contents_unstaged" + "test_no_pep621" + "test_pep621" + "test_dynamic_version" + "test_contents" + "test_contents_subdirs") + " and not "))))))))) + (propagated-inputs + (list meson-0.63 ;>=0.62 required + ninja + ;; XXX: python-meson forcefully sets the RUNPATH of binaries + ;; for vendoring purposes, and uses PatchELF for that(!). This + ;; functionality is not useful in Guix, but removing this + ;; dependency is tricky. There is discussion upstream about making + ;; it optional, but for now we'll just carry it: + ;; https://github.com/FFY00/meson-python/issues/125 + patchelf + python-colorama + python-pyproject-metadata + python-tomli + python-wheel)) + (native-inputs + (list python-pypa-build + python-wheel + + ;; For tests. + pkg-config + python-gitpython + python-pytest + python-pytest-mock)) + (home-page "https://github.com/FFY00/mesonpy") + (synopsis "Meson-based build backend for Python") + (description + "meson-python is a PEP 517 build backend for Meson projects.") + (license license:expat))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 2ffaa12247..8a992b8cb1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -84,6 +84,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages meson) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index dab044d9f7..ebdcadad2c 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -52,6 +52,7 @@ (define-module (gnu packages python-science) #:use-module (gnu packages image-processing) #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) + #:use-module (gnu packages meson) #:use-module (gnu packages mpi) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 506245fd17..fd327fb27f 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -51,6 +51,7 @@ (define-module (gnu packages syndication) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages meson) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 64a26edb02..f3cb521599 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -96,6 +96,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages m4) + #:use-module (gnu packages meson) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 9fee6c4570..440577ddb8 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -124,7 +124,7 @@ (define (default-ninja) (define (default-meson) "Return the default meson package." ;; Lazily resolve the binding to avoid a circular dependency. - (let ((module (resolve-interface '(gnu packages build-tools)))) + (let ((module (resolve-interface '(gnu packages meson)))) (module-ref module 'meson))) (define* (lower name -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 18:01:28 2023 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: From: Vivien Kraus Date: Fri, 6 Jan 2023 23:48:21 +0100 Subject: [PATCH v2 2/2] gnu: p11-kit-next: Switch to meson-build-system. To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 18:06:06 2023 Received: (at 60586) by debbugs.gnu.org; 6 Jan 2023 23:06:06 +0000 Received: from localhost ([127.0.0.1]:56057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvmn-0006lQ-Se for submit@debbugs.gnu.org; Fri, 06 Jan 2023 18:06:06 -0500 Received: from planete-kraus.eu ([89.234.140.182]:49982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDvml-0006l4-IM for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 18:06:04 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a5211b1a for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:in-reply-to:references :content-type:content-transfer-encoding:mime-version; s=dkim; bh=CV7ZGnL+X6TIX+Kedepp6XtiBzM=; b=gPCYdPIyH61blqO5IBv/YZpCIUEg 2IIqswLV3q0Fr/c/xCJ+htsLTh5C59ryrwibrxKlQLNaubcKjvpeifZwSSCzrBq2 4OPUBVCQz8Y67JER8T40SOj3aef2+qUWMbUWWQBM04tCntnW5G7/UdBG5K0vkrEg QMd0/mu8eiGvsTI= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 771d9f8b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Fri, 6 Jan 2023 23:05:59 +0000 (UTC) Message-ID: Subject: Re: [PATCH v2 0/2] Switch p11-kit-next to meson-build-system From: Vivien Kraus To: 60586@debbugs.gnu.org Date: Sat, 07 Jan 2023 00:05:57 +0100 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le vendredi 06 janvier 2023 =C3=A0 23:55 +0100, Vivien Kraus a =C3=A9crit= =C2=A0: > I had to read the git log twice to make sure I got the correct > copyright > notices (including dates) for both meson-related stuff and the other > packages > in (gnu packages build-tools). To be clear, I=E2=80=99m not complaining, I=E2=80=99m just explaining where= I got these copyright notices from. From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 22:18:59 2023 Received: (at 60586) by debbugs.gnu.org; 7 Jan 2023 03:19:00 +0000 Received: from localhost ([127.0.0.1]:56220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDzjX-0005Pv-Kn for submit@debbugs.gnu.org; Fri, 06 Jan 2023 22:18:59 -0500 Received: from planete-kraus.eu ([89.234.140.182]:52724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDzjW-0005Pk-9x for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 22:18:58 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 67c5a39b for <60586@debbugs.gnu.org>; Sat, 7 Jan 2023 03:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=dkim; bh=8xW3v7V 1ADV8M0qshe0+b00x/X0=; b=dvG+UpIcMTF+3oE/Yp2o46t2EZNXpB3t8kJnoaf GNgXs9giziDUNNTLnzpd5FlaM31z1hEV6C68C9SatCFD0SQBjMkaB9jGfcITsWY/ iPN2TKsbj8Bo84Sf7Cq0Jnk+0pAl+K1sbA7Nw/oxZ9Ai3pedopGSWNcHmB75U+cE G/rA= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4ca81fa5 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Sat, 7 Jan 2023 03:18:52 +0000 (UTC) Message-Id: From: Vivien Kraus Date: Sat, 7 Jan 2023 04:15:04 +0100 Subject: [PATCH v3 0/1] Switch p11-kit-next to meson-build-system. To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) It’s simpler than what I thought: p11-kit builds directly, no need to isolate meson. Vivien Kraus (1): gnu: p11-kit-next: Switch to meson-build-system. gnu/packages/tls.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) base-commit: cce9ff2d5ada3d1e26e1c70205f21271a0065482 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 06 22:19:03 2023 Received: (at 60586) by debbugs.gnu.org; 7 Jan 2023 03:19:03 +0000 Received: from localhost ([127.0.0.1]:56224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDzja-0005QY-UH for submit@debbugs.gnu.org; Fri, 06 Jan 2023 22:19:03 -0500 Received: from planete-kraus.eu ([89.234.140.182]:52724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDzjY-0005Pk-LA for 60586@debbugs.gnu.org; Fri, 06 Jan 2023 22:19:01 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 527860ed for <60586@debbugs.gnu.org>; Sat, 7 Jan 2023 03:18:59 +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=lwTRlf j84OqWaEaeBgrtJmDyqlv4kJUXAWvQkVF90Z6qU3Nn4wvzcgcyWurzG2Onpbic88 q7Snxu48E4QAyRzQN7SmVtDrGJAmShS2zpQu+T9nFbBA0TmPg0op54ofO8aLser6 eLqNhEdaLwg2rRywghDZmXY9aPEUOkf1Hw16w= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 4315a452 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60586@debbugs.gnu.org>; Sat, 7 Jan 2023 03:18:58 +0000 (UTC) Message-Id: <6fd07b81d511ed41e2147380f0cbb7d02e851318.1673061304.git.vivien@planete-kraus.eu> In-Reply-To: References: From: Vivien Kraus Date: Fri, 6 Jan 2023 23:48:21 +0100 Subject: [PATCH v3 1/1] gnu: p11-kit-next: Switch to meson-build-system. To: 60586@debbugs.gnu.org MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: 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) # [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date X-Debbugs-Envelope-To: 60586 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 17 10:49:50 2023 Received: (at submit) by debbugs.gnu.org; 17 Feb 2023 15:49:50 +0000 Received: from localhost ([127.0.0.1]:41062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT2ze-0005kQ-5K for submit@debbugs.gnu.org; Fri, 17 Feb 2023 10:49:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:40906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT2zd-0005kJ-6E for submit@debbugs.gnu.org; Fri, 17 Feb 2023 10:49:49 -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 1pT2zc-0001co-8W for guix-patches@gnu.org; Fri, 17 Feb 2023 10:49:48 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT2za-0005CV-OH for guix-patches@gnu.org; Fri, 17 Feb 2023 10:49:48 -0500 Received: from localhost (cpc158837-hari22-2-0-cust393.20-2.cable.virginm.net [86.20.51.138]) by mira.cbaines.net (Postfix) with ESMTPSA id BFE8C1693E; Fri, 17 Feb 2023 15:49:41 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f222b61a; Fri, 17 Feb 2023 15:49:40 +0000 (UTC) References: <6fd07b81d511ed41e2147380f0cbb7d02e851318.1673061304.git.vivien@planete-kraus.eu> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines To: Vivien Kraus Subject: Re: [bug#60586] [PATCH v3 1/1] gnu: p11-kit-next: Switch to meson-build-system. Date: Fri, 17 Feb 2023 15:49:05 +0000 In-reply-to: <6fd07b81d511ed41e2147380f0cbb7d02e851318.1673061304.git.vivien@planete-kraus.eu> Message-ID: <877cwgmgvf.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: 60586-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Vivien Kraus via Guix-patches via writes: > 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(-) I tweaked the changelog in the commit message to be a bit more specific and pushed this to master as 95f481b33167cd231fda080c76eb980550fd1eae. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPvohRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xe6khAAl0S0iv5cFBFMAGd6PfEZZxyIWaz/3+Sr f+0LDVpq1tm+CmcsdK7aiW6QLxSrhRDWXLnQBMZpkG1F/dbIyg4id+YVnuBsNigu D49zjsXtu8SvJH2ieqm2HP/rlj8+h1kfRqq+WL0poYfxQ6yfRDp2l/OIAw2EMcUk 4xBVZCTKb7uShLSDf8QdQeixz9yJ9utzxY2lsiS7RFLKPCR6vwIfW9I8Qp0B/rEv xcoTSQRJ1sL8/NKn/mMeKOCRwT8WgHecJOkpqzhn8vYwpt1pC6EH9YK+Dys1OoXl 8WwiW0zysYxvWeDJds8Y3vOGNNxY/ir1fX7bzf1qW3L7Jh5dFSKnRR+3fu02kyuM tZmlWVl7pxpHn1cosmZ02dRwkbPblu2vQOYCPTOk3naGn4wVO6Dcbqp1Pb66bTpb cTUY6yRO3FZ9Kfr3SLM8oBTVAC96OD/QP0M1/AX3aoZguq4QM3wXv7G9SOmvHRGh Bq3hfnvSua0jh8L1e814XjfGr0Njur0QNRgtz0YmfCWHe/7pJODZamHR8jzHj/Xs eew0YzC1l64lW+f5s7X4N0MTPYcLp/JfxinEALPAPINkYSl4aCNH/bGxs8SbMwFj kPnmM6bT7MVs/Y7BIKGz5vgmB+fdJXd2ynaSgQRCJCvVawK6XwW0LYuAHqUuvidJ /gm/0sPYVlY= =hN5y -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jun 19 14:03:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 18 Mar 2023 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator