From patchwork Sun Jun 18 20:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51063 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 ED7C227BBE2; Sun, 18 Jun 2023 21:54:39 +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 B8AF427BBEA for ; Sun, 18 Jun 2023 21:54:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPP-0006bx-S0; Sun, 18 Jun 2023 16:54:03 -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 1qAzPO-0006b2-Fd for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54: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 1qAzPO-0002E2-5x for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPN-0007SS-M6 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 1/8] gnu: Add mpark-variant. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712161428541 (code B ref 64137); Sun, 18 Jun 2023 20:54:01 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:34 +0000 Received: from localhost ([127.0.0.1]:55027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOv-0007QH-RM for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:34 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOt-0007Pz-PE for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:33 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D9EF5240101 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121605; bh=gCyLr1V7iGAypZxq5cuYu/3Xi5M2BHUl2u6QBQM1jNk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=DMaxM7qNEOJh5dah4cZnTfznCavvK7/5nZ/EFjJqUsKprcr1tPvRCphXwJbiMN+nT eW2fEdwTLFAm+oE9J6YPxP00JZ4v4eX7clO/ZiuP45XQOGEM1S2rrhaQih7LGwGY9h /OC2BZgYicWiNlQgIDLW5ECA5IQChEOWpwTYrw46S0voy8aDo1rEbdmkZds9HfpDUX KHRH//WaLTKHDPfZC3eJyc/0hbCT8WNzAkM0quSCYKgroahsullVV2eoeBo2rcC4l4 PaNVWvc9qp58pD/0NPTI1hCiSFwSjkwmhwwTKtIKuYB4TQ9H3+bHcLV/NXW/o9dXj0 WFWVb/k30OpXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVF3k0Rz6tm4; Sun, 18 Jun 2023 22:53:25 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:00 +0000 Message-Id: <290bd1b3b75a4f870923952f77dca2d096e7529b.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/cpp.scm (mpark-variant): New variable. --- gnu/packages/cpp.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 39a34c20dd..5a6298fc4d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2022 muradm ;;; Copyright © 2022 Attila Lendvai ;;; Copyright © 2022 Arun Isaac -;;; Copyright © 2022 David Elsing +;;; Copyright © 2022, 2023 David Elsing ;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Sughosha @@ -2553,3 +2553,38 @@ (define-public ftxui @item No dependencies. @end itemize") (license license:expat))) + +(define-public mpark-variant + (package + (name "mpark-variant") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mpark/variant") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0gz8d5qprlfqb42cfyyc4nbwhgarhw027a9nr52h3gbdn560j0j4")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DMPARK_VARIANT_INCLUDE_TESTS=mpark") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'find-googletest + (lambda _ + (substitute* "test/CMakeLists.txt" + (("add_subdirectory.*3rdparty/googletest.*\n") + "find_package(GTest REQUIRED)\n") + ((".*3rdparty/googletest.*\n") "") + ((".*config_compiler_and_linker.*\n") "") + (("gtest_main") "gtest gtest_main"))))))) + (native-inputs (list googletest)) + (home-page "https://github.com/mpark/variant") + (synopsis "Implementation of the C++17 std::variant for C++11/14/17") + (description + "MPark.Variant provides the C++17 std::variant for C++11/14/17. It is +based on the implementation of std::variant in libc++.") + (license license:boost1.0))) From patchwork Sun Jun 18 20:53:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51065 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 E72CE27BBE2; Sun, 18 Jun 2023 21:54:47 +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 0D58B27BBEA for ; Sun, 18 Jun 2023 21:54:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPQ-0006cN-8S; Sun, 18 Jun 2023 16:54: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 1qAzPO-0006bG-Pp for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -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 1qAzPO-0002E7-G6 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPO-0007SZ-15 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 2/8] gnu: Add tsl-hopscotch-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712161728568 (code B ref 64137); Sun, 18 Jun 2023 20:54:01 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:37 +0000 Received: from localhost ([127.0.0.1]:55035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOz-0007Qd-9R for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:37 -0400 Received: from mout01.posteo.de ([185.67.36.65]:54339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOx-0007Q4-2w for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 62B91240028 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121609; bh=8eFSnAj+eq3M3K1R5oyXczEK1lfArpaMdhmfWnAd1JY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=V2vru+eFwmT6+bWrCIE3k5RTMe5t6XvFpWB0Tm8JFa0yZn/GeCb6KW0G2gAySg75R vxPpQ0WmSvRCVoPiaUHPe3hY1ITD+7YBCVVLj1Llk2o/FsaW94+df8qGQBorCmBNJ/ FeCWsC58Nt3z1Rul5CftPs6Ods4W3qAuNVapxNoM/g5QH5YGGVFKdIkHf0PrYEvzoU yfgdpdhigryrZagca6iJaktHoO4RfiJfVklH40c+bt1fFBHBV+EpT6/46a5DiYpW6f Kd3vUnnNPVRs/7ANAeKbvqlrPsQrfKoxbiYXEEZKkzT00VxgMOpZJXWsScYU+6+P7v KFuSCivpmsuuQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVH5z2dz9rxT; Sun, 18 Jun 2023 22:53:27 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:01 +0000 Message-Id: <68b5dda8fc0b5d59188cda3cf33f0f1537c6efed.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/cpp.scm (tsl-hopscotch-map): New variable. --- gnu/packages/cpp.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5a6298fc4d..7878aa2a6d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2588,3 +2588,38 @@ (define-public mpark-variant "MPark.Variant provides the C++17 std::variant for C++11/14/17. It is based on the implementation of std::variant in libc++.") (license license:boost1.0))) + +(define-public tsl-hopscotch-map + (package + (name "tsl-hopscotch-map") + (version "2.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tessil/hopscotch-map") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "012pw37w000pdxdvps0wsqrw6597cm6i6kr5rpl303qmiwqicb2p")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-test + (lambda _ + (let ((file (open-file "CMakeLists.txt" "a"))) + (display "\nenable_testing()\nadd_subdirectory(tests)" file) + (close-port file)) + (substitute* "tests/CMakeLists.txt" + (("set\\(Boost_USE_STATIC_LIBS.*") "") + (("add_subdirectory\\(\\.\\..*") + "add_test(tsl_hopscotch_map_tests tsl_hopscotch_map_tests)\n"))))))) + (native-inputs (list boost)) + (home-page "https://github.com/Tessil/hopscotch-map") + (synopsis "C++ implementation of a hash map and hash set using hopscotch hashing") + (description "This package provides a C++ implementation of a hash map and +a hash set using open-addressing and hopscotch hashing to resolve +collisions.") + (license license:expat))) From patchwork Sun Jun 18 20:53:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51066 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 EF70127BBEC; Sun, 18 Jun 2023 21:54:49 +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 645D427BBEA for ; Sun, 18 Jun 2023 21:54:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPR-0006dQ-Tw; Sun, 18 Jun 2023 16:54:05 -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 1qAzPO-0006bH-Qd for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54: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 1qAzPO-0002EF-G6 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPO-0007Sg-CM for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 3/8] gnu: Add tsl-sparse-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162128586 (code B ref 64137); Sun, 18 Jun 2023 20:54:02 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:41 +0000 Received: from localhost ([127.0.0.1]:55039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP2-0007Qy-O8 for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOx-0007Q6-Bg for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:35 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id CF3AD240029 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121609; bh=ZuHw/i8UpteXEk1LnBvXW4U4c4tlaoys02QtHSfiJbg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=XKkhkC5O3ZHK9UwEa2B35ii7cDiiAcuF5aDpGhiSXmVVBONF/tyMscZh4AEhf/HM9 evLaboR78GUfq3fD6GpFzifztlpJ+xfTUpUjd+y8oAhtC8dCnTeWusWzSU5nPZPDoZ 5jLHBxgDl9S/rMFdGRCMG7FNWtyz0M903gFQkVmbt+0GVIRlF6EipX3YTsX55Td+1R /NlRWM6JZoYasZa0LKMI2vr4hMdzmD5ZlfPSJ/QawOt9mxqeHrwp/6TUhWVMrzAZ48 tQlF6fjrFQp/lV/ZRaEfoaoeULne5CjpEhGXWDqIigkAplm+oCkjGHaVrYBojP+Uzt yY/I8nLVznAhQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVK3PHpz6tvJ; Sun, 18 Jun 2023 22:53:29 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:02 +0000 Message-Id: <56a3a24a9156aac5918076616220ee2cd3228cc2.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/cpp.scm (tsl-sparse-map): New variable. --- gnu/packages/cpp.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7878aa2a6d..6f558d1f5b 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2623,3 +2623,37 @@ (define-public tsl-hopscotch-map a hash set using open-addressing and hopscotch hashing to resolve collisions.") (license license:expat))) + +(define-public tsl-sparse-map + (package + (name "tsl-sparse-map") + (version "0.6.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tessil/sparse-map") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0rb7w0hzsj4qbm0dff1niaf75aag9lj0xqhgb3vg5h9hfic62ic2")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-test + (lambda _ + (let ((file (open-file "CMakeLists.txt" "a"))) + (display "\nenable_testing()\nadd_subdirectory(tests)" file) + (close-port file)) + (substitute* "tests/CMakeLists.txt" + (("set\\(Boost_USE_STATIC_LIBS.*") "") + (("add_subdirectory\\(\\.\\..*") + "add_test(tsl_sparse_map_tests tsl_sparse_map_tests)\n"))))))) + (native-inputs (list boost)) + (home-page "https://github.com/Tessil/sparse-map") + (synopsis "C++ implementation of a memory efficient hash map and hash set") + (description "This package provides a C++ implementation of a hash map and +a hash set with focus on memory efficiency.") + (license license:expat))) From patchwork Sun Jun 18 20:53:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51061 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 D336C27BBEA; Sun, 18 Jun 2023 21:54:32 +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 6CB3A27BBE2 for ; Sun, 18 Jun 2023 21:54:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPS-0006dm-Er; Sun, 18 Jun 2023 16:54:06 -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 1qAzPP-0006bP-5e for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -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 1qAzPO-0002ET-Sn for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPO-0007So-Na for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 4/8] gnu: Add tsl-ordered-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162128593 (code B ref 64137); Sun, 18 Jun 2023 20:54:02 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:41 +0000 Received: from localhost ([127.0.0.1]:55041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP3-0007R1-29 for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:41 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzOy-0007Q8-Vm for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:37 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 727B0240027 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121611; bh=HISzlDs01wBsLzuJy/0l4S9IzHQVx1zKf6GM1cDB7do=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=GO5X3w1epcL/F4EUoY4qDvPBCbDsiQj7OFFs9Hv1neCjXWH9FPJWudopR6Ud47irj Ghpuksk6X4T1d45dKxzn2LGXb5SQEbCW2NlhVpSaEZyVHKbDpfMI5GKhlxq5TAVTGx Muk/JAsx4BwFRnG2Smmv/3g7f92RWkxvT/GtgaFYQNLoxmuWw6qgOWTsQ8CNZiECwf wUNJ+dtS7GIyEi9hQaeGRPJSyeeqarSqyYURYv5p0SAWPpLPjyjm3hmHcHRHeWd9Da EQSXz5HQGeCLn5IOv6CWukeR5KYoYx9jkzGRbMc2b9s6VAnRrZIrER6VVdaFl1yL3z SKzZgxj0vCgQA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVM0pGPz9rxN; Sun, 18 Jun 2023 22:53:31 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:03 +0000 Message-Id: <2b2531530f0a4961b6492d5a7b93db65cc3ad35e.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/cpp.scm (tsl-ordered-map): New variable. --- gnu/packages/cpp.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6f558d1f5b..f1d7e89537 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2657,3 +2657,37 @@ (define-public tsl-sparse-map (description "This package provides a C++ implementation of a hash map and a hash set with focus on memory efficiency.") (license license:expat))) + +(define-public tsl-ordered-map + (package + (name "tsl-ordered-map") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Tessil/ordered-map") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bz5zgabalb7z0j9scng4zmi95hy7iasry5gz15x6y6dsdz0qf3j")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-test + (lambda _ + (let ((file (open-file "CMakeLists.txt" "a"))) + (display "\nenable_testing()\nadd_subdirectory(tests)" file) + (close-port file)) + (substitute* "tests/CMakeLists.txt" + (("set\\(Boost_USE_STATIC_LIBS.*") "") + (("add_subdirectory\\(\\.\\..*") + "add_test(tsl_ordered_map_tests tsl_ordered_map_tests)\n"))))))) + (native-inputs (list boost)) + (home-page "https://github.com/Tessil/ordered-map") + (synopsis "C++ hash map and hash set which preserve the order of insertion") + (description "This package provides a C++ implementation of a hash map and +a hash set which preserve the order of insertion.") + (license license:expat))) From patchwork Sun Jun 18 20:53:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51064 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 7627127BBEC; Sun, 18 Jun 2023 21:54:46 +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 B8E5027BBE2 for ; Sun, 18 Jun 2023 21:54:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPQ-0006cZ-OW; Sun, 18 Jun 2023 16:54: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 1qAzPP-0006bk-Hl for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -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 1qAzPP-0002Ej-97 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPP-0007Sv-62 for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 5/8] gnu: Add tl-optional. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162728623 (code B ref 64137); Sun, 18 Jun 2023 20:54:03 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:47 +0000 Received: from localhost ([127.0.0.1]:55049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP9-0007Ra-Ed for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34315) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP2-0007QP-2b for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:40 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8996C240027 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121614; bh=t4PqVAU4/RYledQgLgyXA41uX3umwBHAfcLa57QAhuE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=GcDUW4gQhXyAGQ87Ylu4Bf1iix3d8eOLVSecdDD7n5Td9KOjaKb6YWJtIb4H9b1jF 1ZOhjTnKbm40rsXE74dtnLqWlp7+FtEJQPi2E2to3aOeLWk+Oe7wexdGLBWUc+is43 02R4UpjqWO8WrMKzkd+U4wh6WKhbmqAAiDF60Ije6UrDvxmnJbk/wnhn1yXa2aP+K5 2Ehf7SvXRjD64f43v9Rv7nyBqDeM83nJWayGqhCTzGchE4MP6eOdVZz53xRrrJQ6K/ oNkvxIqtIYxgTlvRRgeANySSTvrpXd+davXQyEU+Jt+kjMba3x9z42yzYoCjUDZ8Q5 S/cS0nsMq+YCA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVQ15d2z9rxN; Sun, 18 Jun 2023 22:53:34 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:04 +0000 Message-Id: <3a83b2cb978fa59ec7c3b17517f9ea7c77eded28.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/cpp.scm (tl-optional): New variable. --- gnu/packages/cpp.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f1d7e89537..2fe7f477ce 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2691,3 +2691,35 @@ (define-public tsl-ordered-map (description "This package provides a C++ implementation of a hash map and a hash set which preserve the order of insertion.") (license license:expat))) + +(define-public tl-optional + (package + (name "tl-optional") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TartanLlama/optional") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qkjplmhilbi1iqxx3pz0grcx5355ymk6wwd4h4309mk156xgx2q")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-test + (lambda _ + (substitute* "CMakeLists.txt" + (("FetchContent_Declare.*") "") + ((".*http.*catchorg/Catch2.*") "") + (("FetchContent_MakeAvailable\\(Catch2\\)") + "find_package(Catch2 REQUIRED)"))))))) + (native-inputs (list catch2)) + (home-page "https://github.com/TartanLlama/optional") + (synopsis "C++11/14/17 implementation of std::optional with extensions") + (description "tl-optional is a single-header implementation of +std::optional with functional-style extensions and support for references.") + (license license:cc0))) From patchwork Sun Jun 18 20:53:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51060 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 5E45E27BBE2; Sun, 18 Jun 2023 21:54:30 +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 D75B027BBE9 for ; Sun, 18 Jun 2023 21:54:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPS-0006dV-7J; Sun, 18 Jun 2023 16:54:06 -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 1qAzPP-0006c8-WF for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -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 1qAzPP-0002Et-Nu for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPP-0007T3-KB for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 6/8] gnu: clingo: Unbundle dependencies. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162828631 (code B ref 64137); Sun, 18 Jun 2023 20:54:03 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:48 +0000 Received: from localhost ([127.0.0.1]:55051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP9-0007Rc-PB for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:48 -0400 Received: from mout01.posteo.de ([185.67.36.65]:43123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP4-0007Qc-C4 for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id D04AA240028 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121616; bh=bGN3wv57J4LTWNemHR0S4uZqLFnhCnJZ65ieXd0040s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=anl9a5wHOgOvPtI7yFX4wSi6bPHtaEUsxoUtenYUOr0azEak/QLcirJAf9HlgAb1s CHuFMGYL9PUUFo34i89/oyii7bcvXQryZE5TfQQkIfbhTCz73GjST/WUV6G9GGCxZO my7UAA+Fbn6IHV2OqCuevWyEdGQDbiqzQaRquatM1LG+YXGY1+700Hn5KBq9iU8vZ3 ikrAp8GJEpq+EI/jkuSl30l728ULOUIs+5aECF0o13L1D5rTUKAW3fIVV+jJJmT+sO GgLJWp3y39kJ3T6zvA6CEi6XD5wR/gSA6sFaf228mT7iGLk6lM0EysEZTgbI+bWYTG 4T95gjDWg2MAQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVS3fBzz9rxL; Sun, 18 Jun 2023 22:53:36 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:05 +0000 Message-Id: In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/potassco.scm: (clingo) [arguments]<#:phases>: Patch CMakeLists.txt files to use external dependencies. [native-inputs]: Add mpark-variant, tl-optional, tsl-hopscotch-map, tsl-ordered-map and tsl-sparse-map. --- gnu/packages/potassco.scm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 03d243cdc7..b8e51e7d47 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022, 2023 Liliana Marie Prikler ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2023 David Elsing ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ (define-module (gnu packages potassco) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (gnu packages check) + #:use-module (gnu packages cpp) #:use-module (gnu packages graphviz) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) @@ -153,8 +155,7 @@ (define-public clingo (snippet #~(begin (delete-file-recursively "clasp") - ;; TODO: Unvendor other third-party stuff - (delete-file-recursively "third_party/catch"))) + (delete-file-recursively "third_party"))) (sha256 (base32 "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) @@ -173,12 +174,22 @@ (define-public clingo (lambda _ (substitute* "CMakeLists.txt" (("add_subdirectory\\(clasp\\)") - "find_package(clasp REQUIRED)")) + "find_package(clasp REQUIRED)") + (("add_subdirectory\\(third_party\\)") + (string-append + "find_package(tsl-hopscotch-map)\n" + "find_package(tl-optional)\n" + "find_package(mpark_variant)\n" + "find_package(tsl-sparse-map)\n" + "find_package(tsl-ordered-map)\n" + "find_package(Catch2 3 REQUIRED)"))) (substitute* "libclingo/CMakeLists.txt" (("\"cmake/Clingo\"") "\"cmake/clingo\"") (("ClingoConfig\\.cmake") "clingo-config.cmake") (("ClingoConfigVersion\\.cmake") "clingo-config-version.cmake")) + (substitute* "libgringo/CMakeLists.txt" + (("mpark::variant") "mpark_variant")) (substitute* "cmake/ClingoConfig.cmake.in" (("find_package\\(Clasp") "find_package(clasp")) (rename-file "cmake/ClingoConfig.cmake.in" @@ -199,7 +210,12 @@ (define-public clingo "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) (inputs (list catch2-3.1 clasp libpotassco)) - (native-inputs (list pkg-config)) + (native-inputs (list mpark-variant + pkg-config + tl-optional + tsl-hopscotch-map + tsl-ordered-map + tsl-sparse-map)) (home-page "https://potassco.org/") (synopsis "Grounder and solver for logic programs") (description "Clingo computes answer sets for a given logic program.") From patchwork Sun Jun 18 20:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51067 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 E64B227BBE2; Sun, 18 Jun 2023 21:54:51 +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=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 61CC127BBE9 for ; Sun, 18 Jun 2023 21:54:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPR-0006dR-W5; Sun, 18 Jun 2023 16:54:06 -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 1qAzPQ-0006cQ-Cd for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -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 1qAzPQ-0002F0-3V for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPP-0007TA-VW for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 7/8] gnu: catch2-3.1: Rename to catch2-3.3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162928642 (code B ref 64137); Sun, 18 Jun 2023 20:54:03 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:49 +0000 Received: from localhost ([127.0.0.1]:55053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzPA-0007Rk-GC for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP6-0007Qr-7p for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B1150240101 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121618; bh=0gSX1DGgSeLA24wuyy4bOLJQ1YdF+Unwvo4v6nIP8tw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=RpiShDqDSr3HZ946HYpqIqDxGG5r7tEpjI1FLzKB2tmjz+CJo3EzygsJ8ciVm34uw 9GNHqqiJwVn/sHtV9yPOIuu68u1WMVxg1oYmP5Rh7wwSbBFqjYQpXwKUUzJ6PLftq+ ecOUOPYRrwdvEqV0wvk8QyizzwpbvsTFoNW0S1peWLg3cOKuwO1JdBVP44NCZIpS8i bn9Jn7jsq9lp2XsJRDxGgpKEqKy2Ntqm0URUBqW9zkTUrLghss17JTbGX8zMchBZvd MreizYutLNov/5QFWHBdPI49hwEMbcXcV1L9RdzO7+wHqmaVQeizGffsmyz0uq0xWK Pjdv43ry5+3PQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVV2gqnz9rxL; Sun, 18 Jun 2023 22:53:38 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:06 +0000 Message-Id: <9438fc1bce335e6cac5297094722e746498d7f8d.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/check.scm (catch2-3.1): Rename to catch2-3.3. * gnu/packages/potassco.scm (clingo): Adjust accordingly. --- gnu/packages/check.scm | 70 +++++---------------------------------- gnu/packages/potassco.scm | 2 +- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 87728fefa3..512b2ac070 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos -;;; Copyright © 2022 David Elsing +;;; Copyright © 2022, 2023 David Elsing ;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo @@ -596,10 +596,10 @@ (define-public cbehave pattern.") (license license:apsl2)))) -(define-public catch2-3.1 +(define-public catch2-3.3 (package (name "catch2") - (version "3.1.1") + (version "3.3.2") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -609,66 +609,14 @@ (define-public catch2-3.1 (file-name (git-file-name name version)) (sha256 (base32 - "1qnr5b3zq8brh43f924rgnw5gmmjf9ax7kbq2crz1mlwgmdymxlp")))) - (outputs (list "out" "static")) - (build-system meson-build-system) + "0m6i3lr0qk303ashjpz5vpwmxf76n5d6s8jq6r6kcy6gph525zmp")))) + (build-system cmake-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-meson - (lambda _ - (substitute* "src/catch2/meson.build" - (("static_library") "both_libraries")))) - (add-after 'install 'install-cmake-config - (lambda* (#:key outputs #:allow-other-keys) - (define prefix (string-append (assoc-ref outputs "out") - "/lib/cmake/Catch2/")) - (mkdir-p prefix) - (call-with-output-file (string-append - prefix - "catch2-config-version.cmake") - (lambda (port) - (format - port - "set(PACKAGE_VERSION ~s)~@ - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)~@ - set(PACKAGE_VERSION_EXACT TRUE)~@ - set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ - elseif(PACKAGE_FIND_VERSION VERSION_LESS_EQUAL ~ - PACKAGE_VERSION)~@ - set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ - else()~@ - set(PACKAGE_VERSION_COMPATIBLE FALSE)~@ - endif()" - #$version))) - (call-with-output-file (string-append prefix - "catch2-config.cmake") - (lambda (port) - (format - port - "include(FindPkgConfig)~@ - pkg_check_modules(CATCH2 IMPORTED_TARGET GLOBAL catch2)~@ - pkg_check_modules(CATCH2MAIN ~ - IMPORTED_TARGET GLOBAL ~ - catch2 catch2-with-main)~@ - if(CATCH2_FOUND)~@ - add_library(Catch2::Catch2 ALIAS PkgConfig::CATCH2)~@ - endif()~@ - if(CATCH2MAIN_FOUND)~@ - add_library(Catch2::Catch2WithMain ~ - ALIAS PkgConfig::CATCH2MAIN)~@ - endif()"))))) - (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (for-each - (lambda (file) - (install-file file (string-append static "/lib")) - (delete-file file)) - (find-files (string-append out "/lib") - "\\.a$")))))))) + #:configure-flags + #~(list "-DCATCH_DEVELOPMENT_BUILD=ON" + "-DENABLE_WERROR=OFF" + "-DBUILD_SHARED_LIBS=ON"))) (inputs (list python-wrapper)) (synopsis "Automated test framework for C++ and Objective-C") (description "Catch2 stands for C++ Automated Test Cases in Headers and is diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index b8e51e7d47..4e7d715e39 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -209,7 +209,7 @@ (define-public clingo "unpool-ast-v2" "parse_term" "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) - (inputs (list catch2-3.1 clasp libpotassco)) + (inputs (list catch2-3.3 clasp libpotassco)) (native-inputs (list mpark-variant pkg-config tl-optional From patchwork Sun Jun 18 20:53:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51062 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 D256B27BBEC; Sun, 18 Jun 2023 21:54:37 +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 BE55B27BBE2 for ; Sun, 18 Jun 2023 21:54:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAzPU-0006ek-9Q; Sun, 18 Jun 2023 16:54:08 -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 1qAzPQ-0006cc-Pr for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -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 1qAzPQ-0002F5-FG for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAzPQ-0007TH-Bj for guix-patches@gnu.org; Sun, 18 Jun 2023 16:54:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v2 8/8] gnu: Add catch2-static-3.3. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 20:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168712162928648 (code B ref 64137); Sun, 18 Jun 2023 20:54:04 +0000 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:53:49 +0000 Received: from localhost ([127.0.0.1]:55055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzPB-0007Rv-7d for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:49 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45191) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzP8-0007Qz-74 for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:53:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A72AF240104 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:53:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121620; bh=Dn/kHNQv3CmR9+Pz10pvgyROZBNltjkyiNX4J7QAe3I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=q3jinKToSN20he47eIS/9nGNeQu/wM3yrLZiyBHDwMg3NIsTSsnYyM2BFH8KG8jus c/JJ+29iMs+kdGKp1HyGq1JEQXRzrGE19aRkpmH2lboE2Aphe02GjH3Ca16s3Bqq+B sfQzHCDYI9v5cib3q8Qll8hJJJjwO8AkGkt0s1kRrAVdvZC52rMMU//jjcegmaHFHX YfBUIEM7zNCp1v/fySw0ZBM3jahhjBUhS/pDv4HQTPgw2i3i13fLwSScK5qdTgMRkL QHAYDgxiTRqQEK47Wh2zVHxLhDiWuff5TIeioaZa9fmtmvGubd4gzeyQTaFBxGbk0p pJFpZ8B4fdMjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklVX2PSSz9rxK; Sun, 18 Jun 2023 22:53:40 +0200 (CEST) From: David Elsing Date: Sun, 18 Jun 2023 20:53:07 +0000 Message-Id: <7432e21c6c2f8221afbee755366eb9f74bcd41b9.1687121561.git.david.elsing@posteo.net> In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.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: , 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/check.scm (catch2-static-3.3): New variable. --- gnu/packages/check.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 512b2ac070..7986f58cc1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -623,6 +623,17 @@ (define-public catch2-3.3 a multi-paradigm automated test framework for C++ and Objective-C.") (license license:boost1.0))) +(define-public catch2-static-3.3 + (let ((base catch2-3.3)) + (package + (inherit base) + (name "catch2-static") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* "-DBUILD_SHARED_LIBS=OFF" + (delete "-DBUILD_SHARED_LIBS=ON" #$flags)))))))) + (define-public cmdtest (package (name "cmdtest")