From patchwork Sun Jun 25 10:03:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14270 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 C61D227BBE9; Sun, 25 Jun 2023 11:05: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=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 9A43227BBE2 for ; Sun, 25 Jun 2023 11:05:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcC-0002pp-B6; Sun, 25 Jun 2023 06:05: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 1qDMcB-0002pR-11 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcA-0008Kx-LT for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcA-0000Kx-GG for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 1/7] gnu: Add mpark-variant. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874621162 (code B ref 64137); Sun, 25 Jun 2023 10:05:02 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:22 +0000 Received: from localhost ([127.0.0.1]:42031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbW-0000If-DM for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:22 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbT-0000IQ-OZ for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:20 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2AEC1240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687454; bh=W7CeCQH5ONaVb5ymZ1eq3wuOEqiPgRjBcqmDQaXTbfY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=D/rg3UndG17s1goC9coB0o2w0W/ffoEtUNeuV0nWLWQA4ixQMc2AVF7BDebMwJCO3 Znv/alhPAbKfYh2sQqn8FP4DwYVMUWH3fCpOavgMNOuS6E61Kc7cmWzvXtx8OsI4k8 wzeaSM6FwM8d0hcqh1xxgxOjwSxnWpNJq/uqp1iover25ae35hHcy1kgRM7XlorNij GTl2D8zf0C+DxCE7Hzanu1tjQ0NoD3f9ZICA6e7DypMKFdjE+1mNR6VMP9kSEAFnlw IhXQSgg77QOIWA1GtGnNmcvfkGW2szN3nCVw+g3krG9ofWJ6RidBsYEdORTNxQorDF f9duNojXOzwEw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qpmlx3jynz6tv5; Sun, 25 Jun 2023 12:04:13 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:53 +0000 Message-Id: In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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..8139a9d083 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 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 25 10:03:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14269 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 AAF0327BBE9; Sun, 25 Jun 2023 11:05:19 +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 0408327BBE2 for ; Sun, 25 Jun 2023 11:05:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcC-0002q1-NT; Sun, 25 Jun 2023 06:05: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 1qDMcB-0002pZ-Ej for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcB-0008Ou-3A for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcA-0000L5-Ut for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 2/7] gnu: Add tsl-hopscotch-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874681182 (code B ref 64137); Sun, 25 Jun 2023 10:05:02 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:28 +0000 Received: from localhost ([127.0.0.1]:42035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbb-0000Iz-Qb for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:28 -0400 Received: from mout02.posteo.de ([185.67.36.66]:36629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbZ-0000IW-1q for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:25 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 182FB240103 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687459; bh=wn58dTcyqNMBY481D0FIVUd392q/gYh7Ec0DRZmM2OA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=hjID1sbZAbhSangTKKVTH7V4DcG51HbxUdKWZ3ipNyAchxOxsRPCkbpw6JjsPGdvn IXGHXomvIK0PmZI5F5/wbYv1zkcJF12ks2PKe1JJFOXbRAGlCiZe5gtMhghmi6jmYd V62tIeb52nqxOZ+JTVPa3jJ2AIfBu46cgoJrlj7RxGQ7GnnJ2s/SIxAtzP8QaJhIvB GDnfi/uKVGkPbEymXQtXiauMM6yRWEmR2Jbxnc8FbmtSMRicqqFCZcnd+pND29ZcAl iYnyAukQVoEOqjQlcmtRFMsWkJbOE9jenQUPLcvq/E3h/9y/WVaKWGgMG3/Z/umUaD Cu8iyzCI/KrdA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qpmm06KKHz9rxS; Sun, 25 Jun 2023 12:04:16 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:54 +0000 Message-Id: <90131ea6f8f2f4781a4c36721b8248bbe1764e9f.1687687428.git.david.elsing@posteo.net> In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8139a9d083..afa0878bb7 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2588,3 +2588,39 @@ (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 "Hash maps and hash sets using hopscotch hashing in C++") + (description "This package provides a C++ implementation of several hash +map and a hash set variants using open addressing and hopscotch hashing to +resolve collisions. It is intended to be fast and provides additional +features, such as heterogeneous lookups and different growth policies.") + (license license:expat))) From patchwork Sun Jun 25 10:03:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14274 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 002C727BBEA; Sun, 25 Jun 2023 11:05:41 +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 5F10827BBE9 for ; Sun, 25 Jun 2023 11:05:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcE-0002t2-RZ; Sun, 25 Jun 2023 06:05: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 1qDMcC-0002pg-3r for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcB-0008Rw-Ij for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcB-0000LC-EB for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 3/7] gnu: Add tsl-sparse-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874711198 (code B ref 64137); Sun, 25 Jun 2023 10:05:03 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:31 +0000 Received: from localhost ([127.0.0.1]:42039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbf-0000JG-EG for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:31 -0400 Received: from mout02.posteo.de ([185.67.36.66]:45289) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbc-0000In-KB for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:28 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 221DA240103 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687463; bh=ZZIfd5QegtS9+VSqiD80JKMuHNdyyeF3Gn2llwkA+qk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=JB4E5eIxrBtv5BYVOXcIQ6FtU3maJj5bVlixvSbLgWJ9K/xxNye2EuIjr+E+l1kdo 5Qn5yD3G03+RIcDRUwWv62d1M8ZjPg0tPJb0IogSWPm3gOMYcUeA4aaAlyp5Yz19MK 4+X4pMSYexX2REJbk3YerNL+RuEY88I4GHa71f1RmsTFBqdZxkosfp6zzoEVIoyJmf xtK4eTVqrN+Fxy/VhDHX54Sy+DgANkesyN9C4DTp0AKR4H1ttZSg2jz93dWQMKYCjl BP1Tdzluj6LwtBBfDKXNK+/Cz1qgNWGWP2ZKshG2mO27AZHqsHQhbqve2CUmXFSzRE UOHboM4QFry8Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qpmm61433z6tw4; Sun, 25 Jun 2023 12:04:21 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:55 +0000 Message-Id: <7574236a116179f9ceadc7a1b5bbac20d2dfd849.1687687428.git.david.elsing@posteo.net> In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index afa0878bb7..adf9e5b2f0 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2624,3 +2624,39 @@ (define-public tsl-hopscotch-map resolve collisions. It is intended to be fast and provides additional features, such as heterogeneous lookups and different growth policies.") (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 "Memory efficient hash map and hash set in C++") + (description "This package provides a C++ implementation of a hash map and +a hash set with open addressing and sparse quadratic probing. It is intended +to be memory efficient and provides additional features, such as heterogeneous +lookups and different growth policies.") + (license license:expat))) From patchwork Sun Jun 25 10:03:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14273 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 0EA2F27BBE9; Sun, 25 Jun 2023 11:05:38 +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 40DC427BBE2 for ; Sun, 25 Jun 2023 11:05:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcE-0002sY-3m; Sun, 25 Jun 2023 06:05: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 1qDMcC-0002pj-92 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcB-0008S4-W2 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcB-0000LK-R0 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 4/7] gnu: Add tsl-ordered-map. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874781222 (code B ref 64137); Sun, 25 Jun 2023 10:05:03 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:38 +0000 Received: from localhost ([127.0.0.1]:42043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbl-0000Jd-Ri for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:38 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbi-0000JC-9J for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:34 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C2886240101 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687468; bh=7wM4iO2bo3MZiTjv8TWzXPMyTtt4T0kvN6gqifCLvZ0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=gWPJS+ABj9qUZMDRYbv5S8ht/22LcQze9QF8SXM236gLNHpLvbEi55KU7RT+vgALm 5huzyUjanu0jYzFUi5UJbzEPaMrzfH2FamWkfw4G1kp4XKis5xUI1jlqXGhcbWHGjY /5elYJjfcBin8owjHoT2NJmpKQ5TMSxVXePWFQHUyGwtqB43Aokm+NG6ZDpiQv9RpT XnE2A4/NRUQt1vQbbtDN0RQXqAZkpePtkabXULogmY7hlvHDSxr4W8p5emgqtBDHeb jZ6ojdOEyNpk7X4SniBwsErBzNfs4my3UeUrlGyXe8niT1ze/peBk3dnxyhmQeiHRD +o9Sx9SjLmXeQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmB2fc0z6tw4; Sun, 25 Jun 2023 12:04:26 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:56 +0000 Message-Id: In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index adf9e5b2f0..efce934e6d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2660,3 +2660,39 @@ (define-public tsl-sparse-map to be memory efficient and provides additional features, such as heterogeneous lookups and different growth policies.") (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 "Hash map and hash set which preserve the order of insertion in C++") + (description "This package provides a C++ implementation of a hash map and +a hash set which preserve the order of insertion. It is intended for +efficient ordered insertions and lookup, while sacrifing performance for +ordered erase operations.") + (license license:expat))) From patchwork Sun Jun 25 10:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14272 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 7687D27BBEA; Sun, 25 Jun 2023 11:05:33 +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 D921727BBE2 for ; Sun, 25 Jun 2023 11:05:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcF-0002tG-8f; Sun, 25 Jun 2023 06:05:07 -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 1qDMcC-0002q6-PE for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05: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 1qDMcC-0008SJ-FU for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcC-0000LV-Au for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 5/7] gnu: Add tl-optional. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874831245 (code B ref 64137); Sun, 25 Jun 2023 10:05:04 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:43 +0000 Received: from localhost ([127.0.0.1]:42049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbr-0000K0-CS for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:43 -0400 Received: from mout01.posteo.de ([185.67.36.65]:48067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbm-0000JO-6U for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:38 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id AB6E7240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687472; bh=3iOix3E1jH1V27tWxlQrSTINo0DC3WO0vaVFIBN/lxk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=Jf+VW7hPsAy1/nn42rcZVfcsGr/fGA0D3aDAi1vuvbKBTdaTgweBSKi5+Iz6U7evr MnpjXc8FS6yjGnS4L+VKbrbjpJFefbWn8NyP/evEzIVsnTeuBlnPYXht/jGEXB4d7h M4CwSMBfwAOc3/+HMg58832mFFKQ+wR+xbxJfGGNDHLLa4uYW8qNKaAFO2CTuxcHu2 +oIx8yNZ+YDor+AOo4dAU8UO4oVloxUA+4Rlskfofo4SMG5SukVDKMj50q7Dba7mdl HqUZ1WM73QNxbJo0moBole4q+Z27d2gFK/VzIUbDHmXL0poCyQ9hXdQqKca8o5nWbI K/+5Q2PlRahXA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmH5kxQz9rxB; Sun, 25 Jun 2023 12:04:31 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:57 +0000 Message-Id: <4285ed9466bf8588533b2e83290ab83a2ca3133d.1687687428.git.david.elsing@posteo.net> In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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 | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index efce934e6d..7e89b9d80a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2696,3 +2696,36 @@ (define-public tsl-ordered-map efficient ordered insertions and lookup, while sacrifing performance for ordered erase operations.") (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 "Implementation of std::optional with extensions for C++11/14/17") + (description "tl-optional provides a single-header implementation of the +C++17 std::optional for C++11/14/17. It includes functional-style extensions +and support for references.") + (license license:cc0))) From patchwork Sun Jun 25 10:03:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14271 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 EF1A427BBE2; Sun, 25 Jun 2023 11:05:28 +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 DB5AB27BBE9 for ; Sun, 25 Jun 2023 11:05:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcE-0002sV-1b; Sun, 25 Jun 2023 06:05: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 1qDMcD-0002sA-4P for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -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 1qDMcC-0008SU-Ra for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcC-0000Lc-N2 for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 6/7] gnu: clingo: Unbundle dependencies. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05: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.16876874871256 (code B ref 64137); Sun, 25 Jun 2023 10:05:04 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:47 +0000 Received: from localhost ([127.0.0.1]:42053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbu-0000KA-M9 for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:47 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbq-0000JZ-1Z for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:42 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 87C0A240103 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687476; bh=kBt7ohEFVPmVsL8JgkhH1lKM957/jLpIajmpQpBoNYY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=QaFyYIy+DCm319hyZBUqdhNHsfNTuz+m4iCrwKPZymhWKI8NeKJ9GwNF68LkBONAJ YPtfyuXRevCKiSXn4Q7cp+ZaquYumV64jEeZBNqsXrDrjoBAIcU48+7nIV+6apQbwr LhVI2CM8NbOnT9TcEvMXiN5jHEj1xfpFquSZPKg43ekpub06wXVGRWHuCRyeVMwGUM qtOfiiF5gdIcKSR9Ylwz3P9xvfy5ZLIXpuisooFmcDzSdgCgpUVDWWp7ipaJ+wmM+c 00abC8+LODkWwRG82dWpjXb383iQaeppr5DvhVtXpv4PnFKGenPsZK/kbVcY5v9F+E plaT/2UGZpOjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmM6fXVz9rxB; Sun, 25 Jun 2023 12:04:35 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:58 +0000 Message-Id: <2c4fc7cde7f5c6c7ebcc278985286a99e942a386.1687687428.git.david.elsing@posteo.net> In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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)[#: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 25 10:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 14275 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 8750727BBE9; Sun, 25 Jun 2023 11:05:44 +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 547CD27BBE2 for ; Sun, 25 Jun 2023 11:05:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcF-0002tn-TW; Sun, 25 Jun 2023 06:05:07 -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 1qDMcD-0002sM-Ik for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -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 1qDMcD-0008Sb-9K for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcD-0000Ll-4O for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 7/7] gnu: catch2-3.1: Rename to catch2-3.3 and update to 3.3.2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05:05 +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.16876874921272 (code B ref 64137); Sun, 25 Jun 2023 10:05:05 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:52 +0000 Received: from localhost ([127.0.0.1]:42055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbz-0000KR-Cw for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:51 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbu-0000Js-Ed for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:47 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E9E71240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687480; bh=eNjWjoMO6RC1gA4uvo9MgpW8L9+4NUUcpwwQgiPB7QA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=cL95VIypJpc6DQsGfAsPZxUJa+gRVM0EzQGmbHaLWEVzG0qCEwo5zY+5ATJawi//A 8lxKHvt1qFbiVQsrEbWJcAIuVj+8ok+LywqeOObbG/2kDqzuiB88LgmE6UDN8TeLG6 y6O25TGn5Xba1ZhgeioxwPJP5I9+vmVuZoumnT6HNQXBkbojHEtM0g2eZrxXASe26t Zpcw53APB/pHBF8cMMMYvyM2VesEAH8LDTviPEYoZuB1Td2eWY9TpuhUcQkk4uyLVD k/c/j1OcfNFZk3HC4TxufBIPdbjE6jnKVwHYOIHcKbLxaD4XWZQQrRkjs8rHPAgNlj mK6FrS3yhCijA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmR2F1Dz6tw4; Sun, 25 Jun 2023 12:04:39 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:59 +0000 Message-Id: In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.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 and update to 3.3.2. [outputs] Only use 'out' output. [build-system] Use cmake-build-system. [arguments]: Remove special phases. Add CMake options to #:configure-flags. * 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