From patchwork Sat Jun 17 19:27:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 970 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 C346B27BBEA; Sat, 17 Jun 2023 20:28:23 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A723727BBE9 for ; Sat, 17 Jun 2023 20:28:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAbae-0004Ga-0d; Sat, 17 Jun 2023 15:28: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 1qAbac-0004GL-Vk for guix-patches@gnu.org; Sat, 17 Jun 2023 15:28: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 1qAbac-0000o1-NG for guix-patches@gnu.org; Sat, 17 Jun 2023 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAbac-0006L6-IP for guix-patches@gnu.org; Sat, 17 Jun 2023 15:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2023 19:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168703007524351 (code B ref -1); Sat, 17 Jun 2023 19:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jun 2023 19:27:55 +0000 Received: from localhost ([127.0.0.1]:52675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbaU-0006Kh-Nz for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:27:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:46038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbaS-0006KX-Lw for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:27:53 -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 1qAbaS-0004Cw-AD for guix-patches@gnu.org; Sat, 17 Jun 2023 15:27:52 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAbaQ-0000lV-4w for guix-patches@gnu.org; Sat, 17 Jun 2023 15:27:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 434C9240027 for ; Sat, 17 Jun 2023 21:27:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687030067; bh=T+tC/TTQIYdictIa/TlXWuncCGRODbilhHk59OwxJDI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=ivnto/hPD2ZRDwnuGUeAQliWXwNe74752ppgU2WZiiIGd7ESHUz0wdh4oz+U/Fxe+ UPVuqrVf37TZC0mUFB7Omo9+q1rDuevMZGvMxk9BnVOvkKII39g+bEwncu4BVM+LL8 pjq9BDr91jvrhuIU0g31MVvo/qX1vq4k63GWUWbhWMApSluDnxxvadvfwSMpP28q7p /ldEXziMYvlc26mCD7naGT/XsUiEQGSvDoIVdgM4NeUT8Py+3teStkIuFFdIvRObb0 yo6fwtiNksPQtySvMenvhUEf00cuBThgT+FZ+Zun8vxjZkO8UwhfoxASB/SM1DFZJo l0WsqdSZJQNKA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qk5dt6XSrz6tmv; Sat, 17 Jun 2023 21:27:46 +0200 (CEST) From: David Elsing Date: Sat, 17 Jun 2023 19:27:18 +0000 Message-Id: MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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 Currently, the catch2-3.1 package is built with Meson. I think this was done to build both static and shared libraries together, which is not supported by CMake. Unfortunately, several CMake files (in lib/cmake/Catch2) are not installed and to install them, CMake would be necessary as build dependency anyway. Only the clingo package depends on this package and the static output is not used in another package. Would it be acceptable to build it with CMake instead, like the catch2 package (for version 2)? I also included a separate package for the static version. Of course, the documentation and headers are then installed in both packages. David Elsing (2): gnu: catch2-3.1: Rename to catch2-3.3. gnu: Add catch2-static-3.3. gnu/packages/check.scm | 81 ++++++++++----------------------------- gnu/packages/potassco.scm | 2 +- 2 files changed, 21 insertions(+), 62 deletions(-) base-commit: 6e1215fb9c03ccb4a2d4440990aee5a66a935268