From patchwork Fri Jan 6 22:55:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 1183 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 C520227BBEB; Fri, 6 Jan 2023 23:01:15 +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 1EAEA27BBE9 for ; Fri, 6 Jan 2023 23:01:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDvi1-0003gE-Ka; Fri, 06 Jan 2023 18:01:09 -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 1pDvhu-0003g1-Um for guix-patches@gnu.org; Fri, 06 Jan 2023 18:01:03 -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 1pDvhu-0001c2-8H for guix-patches@gnu.org; Fri, 06 Jan 2023 18:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDvhu-0006cu-39 for guix-patches@gnu.org; Fri, 06 Jan 2023 18:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60586] [PATCH v2 0/2] Switch p11-kit-next to meson-build-system References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Jan 2023 23:01: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.167304605825456 (code B ref 60586); Fri, 06 Jan 2023 23:01:02 +0000 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: Date: Fri, 6 Jan 2023 23:55:32 +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 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