From unknown Fri Aug 15 03:38:10 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#64137 <64137@debbugs.gnu.org> To: bug#64137 <64137@debbugs.gnu.org> Subject: Status: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 Reply-To: bug#64137 <64137@debbugs.gnu.org> Date: Fri, 15 Aug 2025 10:38:10 +0000 retitle 64137 [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 reassign 64137 guix-patches submitter 64137 David Elsing severity 64137 normal tag 64137 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 17 15:27:55 2023 Received: (at submit) by debbugs.gnu.org; 17 Jun 2023 19:27:55 +0000 Received: from localhost ([127.0.0.1]:52675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbaU-0006Kh-Nz for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:27:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:46038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbaS-0006KX-Lw for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAbaS-0004Cw-AD for guix-patches@gnu.org; Sat, 17 Jun 2023 15:27:52 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAbaQ-0000lV-4w for guix-patches@gnu.org; Sat, 17 Jun 2023 15:27:52 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 434C9240027 for ; Sat, 17 Jun 2023 21:27:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687030067; bh=T+tC/TTQIYdictIa/TlXWuncCGRODbilhHk59OwxJDI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=ivnto/hPD2ZRDwnuGUeAQliWXwNe74752ppgU2WZiiIGd7ESHUz0wdh4oz+U/Fxe+ UPVuqrVf37TZC0mUFB7Omo9+q1rDuevMZGvMxk9BnVOvkKII39g+bEwncu4BVM+LL8 pjq9BDr91jvrhuIU0g31MVvo/qX1vq4k63GWUWbhWMApSluDnxxvadvfwSMpP28q7p /ldEXziMYvlc26mCD7naGT/XsUiEQGSvDoIVdgM4NeUT8Py+3teStkIuFFdIvRObb0 yo6fwtiNksPQtySvMenvhUEf00cuBThgT+FZ+Zun8vxjZkO8UwhfoxASB/SM1DFZJo l0WsqdSZJQNKA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qk5dt6XSrz6tmv; Sat, 17 Jun 2023 21:27:46 +0200 (CEST) From: David Elsing To: guix-patches@gnu.org Subject: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 Date: Sat, 17 Jun 2023 19:27:18 +0000 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=david.elsing@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Currently, the catch2-3.1 package is built with Meson. I think this was done to build both static and shared libraries together, which is not supported by CMake. Unfortunately, several CMake files (in lib/cmake/Catch2) are not installed and to install them, CMake would be necessary as build dependency anyway. Only the clingo package depends on this package and the static output is not used in another package. Would it be acceptable to build it with CMake instead, like the catch2 package (for version 2)? I also included a separate package for the static version. Of course, the documentation and headers are then installed in both packages. David Elsing (2): gnu: catch2-3.1: Rename to catch2-3.3. gnu: Add catch2-static-3.3. gnu/packages/check.scm | 81 ++++++++++----------------------------- gnu/packages/potassco.scm | 2 +- 2 files changed, 21 insertions(+), 62 deletions(-) base-commit: 6e1215fb9c03ccb4a2d4440990aee5a66a935268 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 17 15:30:58 2023 Received: (at 64137) by debbugs.gnu.org; 17 Jun 2023 19:30:58 +0000 Received: from localhost ([127.0.0.1]:52680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbdS-0006RZ-9V for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:30:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:56891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbdQ-0006R9-47 for 64137@debbugs.gnu.org; Sat, 17 Jun 2023 15:30:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D986F240101 for <64137@debbugs.gnu.org>; Sat, 17 Jun 2023 21:30:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687030249; bh=pTIDpt7oCUpK9EDyDGFlvjFRfqr3u0jvwImOAnRvLEM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=bNrJbWPAn7ebFWg6MxXnHv6ZIXH8uidTN6S+yq2JANNgbY+AxOAyxQ+BM1b1UD6Ro 384Xb63s7rSMy/Pc5Eu0wEgaSQ44qQlnRLtyeTLyuKeoeTKFdzpgdldvHzjhs8U4Ho QQRGiZDyCwL2gatwsEvNlvrjtfDujMv5uT+Wcept7kchMt0Mm1/xK3uboX39Jfj8eP k2PPptuPplLVhLl1xqTP6fIsrWezVGR+s7KHCrM8likByouqrz9IuFM/iNhtT2h9Qr w8Is34GJq+rINm+l6CP7vdeR+S2beVTQDHXUQq18HSSJyjqN70tFe8uuJYXQNjWzb4 jJbNgayyPYXgQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qk5jP3PSPz9rxB; Sat, 17 Jun 2023 21:30:49 +0200 (CEST) From: David Elsing To: 64137@debbugs.gnu.org Subject: [PATCH 1/2] gnu: catch2-3.1: Rename to catch2-3.3. Date: Sat, 17 Jun 2023 19:30:18 +0000 Message-Id: <013545ce2e3c48554aaeb8cebb0ec9b3b0f6daf1.1687020412.git.david.elsing@posteo.net> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 03d243cdc7..cf385a65d5 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -198,7 +198,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 pkg-config)) (home-page "https://potassco.org/") (synopsis "Grounder and solver for logic programs") -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 17 15:31:02 2023 Received: (at 64137) by debbugs.gnu.org; 17 Jun 2023 19:31:02 +0000 Received: from localhost ([127.0.0.1]:52683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbdV-0006Ry-TE for submit@debbugs.gnu.org; Sat, 17 Jun 2023 15:31:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAbdT-0006RK-3n for 64137@debbugs.gnu.org; Sat, 17 Jun 2023 15:30:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 8CE9A240027 for <64137@debbugs.gnu.org>; Sat, 17 Jun 2023 21:30:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687030253; bh=Dn/kHNQv3CmR9+Pz10pvgyROZBNltjkyiNX4J7QAe3I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=eixhycbrLt2YNf8qlZRV0BsjSaE7wHAm0/zDhtCBPakSGaRgscPhXTaS3TsfnAqw2 TfcT1QCch4+pMrrkEEz3rEAUtLWdwBjlK+6JvIuibpQxak+kVbrvm33KPijxiZyuUM LTe1ikfpw3IVot8dRE8C7XZtMkXZvQyluDfDxeH0Xouru/YM/wmsCeG7r7i1rZvf/y lDfqxvf0HeSoaOGkhDJazJHejyprmMGTOOjRzKUboXpNavuAUvAo1hiUKETf+/icpc lddTqtjR4orPwUbQFbtQqbokwGACkE2aNTjtoRj6Briz55CF00gpLGapisVFf1d1Jh ypzcXqcK65OGw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qk5jT0cZDz6twS; Sat, 17 Jun 2023 21:30:53 +0200 (CEST) From: David Elsing To: 64137@debbugs.gnu.org Subject: [PATCH 2/2] gnu: Add catch2-static-3.3. Date: Sat, 17 Jun 2023 19:30:19 +0000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 02:55:16 2023 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 06:55:16 +0000 Received: from localhost ([127.0.0.1]:52995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAmJf-00029z-Ts for submit@debbugs.gnu.org; Sun, 18 Jun 2023 02:55:16 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:45445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAmJd-00029l-LP for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 02:55:14 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-51a3e6a952aso2743125a12.3 for <64137@debbugs.gnu.org>; Sat, 17 Jun 2023 23:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687071308; x=1689663308; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=4GG5oH2yvKekDOY4yRSaDc1hAR3/bHl2MpHklt+wO+s=; b=JmzKwgPbYbf83SaDRcFv2ZQi8ENFpEeck1+41kSpeqxxv/rdbKtZ5Veu7tInUk3DDT Szc+N8HfNs4OuifC1YUHYS85kWgsy8uz1KHM20oa8GA616wjH9TAPsso63AQ4kWDGEFH qppLZep5zLMEoKCqYM+uOhdQCToC/QTZ09WeM2BpXhZLoQX+Lbmtnpx+Yg9zX6Tu7ktd T553Z8iKj3YGR3o+FzbvyWBRiXxxLil8a27GnzLtT57He8/3CUcz7KNGrKkt0t5awhtA frPpniPE3ijQD3mI8nNqhUskNP5ib38oq3PhMysd2uwievbP0TK9EA5WIW/x+FRvr8f3 noEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687071308; x=1689663308; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4GG5oH2yvKekDOY4yRSaDc1hAR3/bHl2MpHklt+wO+s=; b=GEXZaki3/E6hJqiUhfvXNZgji7DfZXzCe0pPJwagAb0xl46l8wt7ePQ37FUhX1NmMM ccjPA0x4CRSEIMIZjKPLj2bahACIP3IzwhFy3P/QkV/KxO6bWPj6zYb5o+qamPwFDXMu 2C5N9zPr8IAF2aWdBHeFWmp8gsU17aOj0SkUdV2APH5tODgA/zmL0VAF78+80otN/80n t8u2qLwOorGvJV79KUktuDhoOE1X2ZdJphKGR7I6WmaMZ1VUz6f3iuhqLP8wBb/i2tLW 9ti2g4zE6kcmIykAqNItQ4MpW+aFkytPpMMOAAsSxBf7ayQzU/Yd9zEAlYGEdX3pLjKS hZaw== X-Gm-Message-State: AC+VfDypRGuNr59SKxkU9quCHAaKNbhmfKjJiyTMBui9ZxfOqnJB9bk8 pjkoTjYeYAztdlQ3IkS0KRM= X-Google-Smtp-Source: ACHHUZ7Xd3Abu3pnl5wJ5gmaDYyuAF0npM3A18LNreAnjJh9kfdPGV6o0UivMMBId3dWYm74xWJARw== X-Received: by 2002:a17:907:6d97:b0:988:6193:29d2 with SMTP id sb23-20020a1709076d9700b00988619329d2mr1374358ejc.13.1687071307728; Sat, 17 Jun 2023 23:55:07 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r16-20020a170906705000b00986fa07729csm2091018ejj.94.2023.06.17.23.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 23:55:07 -0700 (PDT) Message-ID: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> Subject: Re: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Sun, 18 Jun 2023 08:55:06 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Samstag, dem 17.06.2023 um 19:27 +0000 schrieb David Elsing: > Currently, the catch2-3.1 package is built with Meson. I think this > was done to build both static and shared libraries together, which is > not supported by CMake. Unfortunately, several CMake files (in > lib/cmake/Catch2) are not installed and to install them, CMake would > be necessary as build dependency anyway. Only the clingo package > depends on this package and the static output is not used in another > package. >=20 > Would it be acceptable to build it with CMake instead, like the > catch2 package (for version 2)? I also included a separate package > for the static version. Of course, the documentation and headers are > then installed in both packages. If you actually get clingo to build, that'd be one thing, but there shouldn't be any issue getting our catch2 to work in CMake-based projects to begin with. After all, we do provide a catch2-config that simply invokes pkg-config. I'd hazard a guess that whatever project you're trying to build pokes at internals it's not really supposed to see. As for the upgrade to 3.3.2, I'd take that in solitude if clingo still builds with it. If not, you'd have to make it an extra version. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:47:18 2023 Received: (at 64137) by debbugs.gnu.org; 18 Jun 2023 20:47:18 +0000 Received: from localhost ([127.0.0.1]:55022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzIs-0007CG-1A for submit@debbugs.gnu.org; Sun, 18 Jun 2023 16:47:18 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAzIq-0007C2-5J for 64137@debbugs.gnu.org; Sun, 18 Jun 2023 16:47:16 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 3AB8F240101 for <64137@debbugs.gnu.org>; Sun, 18 Jun 2023 22:47:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687121230; bh=69Q9QxUZO8UWXn+nbSkomN7jcOCWUVj76jJERBcESCo=; h=From:To:Subject:Date:Message-ID:MIME-Version:From; b=qqBMZlM1wWmRW8ofNRHT0gX2QJHygvSjZTpiTGg5aOxvy3CDW3NHoIP3MSUfZiv+c 5ODbnxvKGB5hQVSOy+rOeWPDCA1NMTxpJI07lcYPWAp35Fi7QFGeGLVSNzsq9sVV4H K63TB0BLwCNKawYG8s00kiblRaD7wG77vY2jLCMhNHW+OEuiDP5ZR0EZz4HZRrn+HP 2nN1aDED0+pUnNaY2bPAkqDNnkxILSXI5bLEINVniV1kX0uQItNhYDgR3+nPwyluFV jAaq6LffCkK5ctrr0IioHcaf+jX1dGMEoTue5JCcVwwD7F+xx1iYDlq1sBct5xeUEA Xs8ZjT3Gms8lA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QklM15ntHz6txF; Sun, 18 Jun 2023 22:47:09 +0200 (CEST) From: David Elsing To: Liliana Marie Prikler , 64137@debbugs.gnu.org Subject: Re: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 In-Reply-To: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> References: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> Date: Sun, 18 Jun 2023 20:47:09 +0000 Message-ID: <7yh6r4ebw2.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Liliana Marie Prikler writes: > If you actually get clingo to build, that'd be one thing, but there > shouldn't be any issue getting our catch2 to work in CMake-based > projects to begin with. After all, we do provide a catch2-config that > simply invokes pkg-config. I'd hazard a guess that whatever project > you're trying to build pokes at internals it's not really supposed to > see. I see, what is missing are the "extras" like catch_discover_tests, but it seems they can just be copied to lib/cmake/Catch2. > > As for the upgrade to 3.3.2, I'd take that in solitude if clingo still > builds with it. If not, you'd have to make it an extra version. To build clingo with 3.3.2, the find_package(Catch2 3.1 ...) command just needed to be adjusted, but I went ahead and unbundled the remaining dependencies as well. Should this be a separate issue? For catch2, it seems simpler to me to build it with CMake, as I don't see the use case for the static library (as a second output). If you prefer, I can change it back to Meson though and just copy the files from the extras directory as well (provided it works). From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:34 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 1/8] gnu: Add mpark-variant. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:37 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 2/8] gnu: Add tsl-hopscotch-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:41 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 3/8] gnu: Add tsl-sparse-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:41 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 4/8] gnu: Add tsl-ordered-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:47 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 5/8] gnu: Add tl-optional. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:48 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 6/8] gnu: clingo: Unbundle dependencies. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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.") -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:49 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 7/8] gnu: catch2-3.1: Rename to catch2-3.3. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 18 16:53:49 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v2 8/8] gnu: Add catch2-static-3.3. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 00:16:53 2023 Received: (at 64137) by debbugs.gnu.org; 22 Jun 2023 04:16:53 +0000 Received: from localhost ([127.0.0.1]:34523 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBkb-0006Hc-CJ for submit@debbugs.gnu.org; Thu, 22 Jun 2023 00:16:53 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:56602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBkX-0006HI-Qb for 64137@debbugs.gnu.org; Thu, 22 Jun 2023 00:16:51 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-987a977f62aso620542266b.1 for <64137@debbugs.gnu.org>; Wed, 21 Jun 2023 21:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687407404; x=1689999404; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=cmRQYZM7avXnhcT9qF8GI1G+ept4IXihNT4AsRZpMxo=; b=r8r+jvKihZPBaWL4T4/bxrQV4zMNV0JZ+cYWT+qRIKaMCxHCi1tNE2MYWc7kShe+1M YJ7SPSydR0NW2oY7wgIQjcDUClLxS4WYZaQAa8NEGLkx4wFGTSRi86bue2DL91KEpx8G kEnXUuo9ALExOBvMz3eFGARQZaZEyuKeI9O8eQlC3pIFRN2cWInQIEd8mACJGy+gNmiT gPqDuoioF0rILjVTsknXnywRe6hfeJVtlSBJUEal6pF/5t12DARjsVcY5BUVG73KHHNB UUf0gZH+LOax7kcpmk0n/KRH8wbToGlenFDNtgcFb2C0U9XOzX67nqXIt5o/76lhDzoE XE7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687407404; x=1689999404; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=cmRQYZM7avXnhcT9qF8GI1G+ept4IXihNT4AsRZpMxo=; b=G0T5gZIPGDST5ZPcclO+K9SBMHXAeBLzYXlJVhkGdCK3KuzfjoBzu0pN/gc0Wxa/ye OyHftE77QyJnamC3MnCDj4ZdINxatE49gVMhATay9Lm3YUP/9dRWiPCQJgdjM+v/reCi It78wO4i769dDmhYswhrNuYgQI0B4VB9f16sx2/144Vs8rfkGm7FoCNEFeDssvWEIqFP trz/qCHShHCKxZO5Ajx4ekIbDfIqrRbuIFxCbGLVkbJlH7SKi9LxIALYlo63prEiLS0b ZJR2ucGrAy0X3JHy9koPq8CEBsKvhWvSCn7OPuBWQQajz8q9+QhOWn0ZX7XVYB7xO2VI A+kQ== X-Gm-Message-State: AC+VfDzq7+3vlrib2CN/JuPlvYktcdoezVMVfTxLrjavMVW3RxuwArKm 4xa1KpGByMQa3zvQKbqPWXM= X-Google-Smtp-Source: ACHHUZ63ZCSnmwkGvX7p4/uMkbiEFrAbW7stNbou1JScFt2/diaE9Hmz2MoRwtnUuedCdOXAvvm1IQ== X-Received: by 2002:a17:907:807:b0:970:71c:df58 with SMTP id wv7-20020a170907080700b00970071cdf58mr13036417ejb.42.1687407403576; Wed, 21 Jun 2023 21:16:43 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id y22-20020a170906071600b0098d374ef2c3sm125743ejb.12.2023.06.21.21.16.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 21:16:43 -0700 (PDT) Message-ID: <9d8eb64fdc54c8c71c902a25a30b64d3b0998700.camel@gmail.com> Subject: Re: [PATCH v2 1/8] gnu: Add mpark-variant. From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Thu, 22 Jun 2023 06:16:42 +0200 In-Reply-To: <290bd1b3b75a4f870923952f77dca2d096e7529b.1687121561.git.david.elsing@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> <290bd1b3b75a4f870923952f77dca2d096e7529b.1687121561.git.david.elsing@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDE4LjA2LjIwMjMgdW0gMjA6NTMgKzAwMDAgc2NocmllYiBEYXZpZCBF bHNpbmc6Cj4gKiBnbnUvcGFja2FnZXMvY3BwLnNjbSAobXBhcmstdmFyaWFudCk6IE5ldyB2YXJp YWJsZS4KPiAtLS0KPiDCoGdudS9wYWNrYWdlcy9jcHAuc2NtIHwgMzcgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrLQo+IMKgMSBmaWxlIGNoYW5nZWQsIDM2IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2NwcC5zY20g Yi9nbnUvcGFja2FnZXMvY3BwLnNjbQo+IGluZGV4IDM5YTM0YzIwZGQuLjVhNjI5OGZjNGQgMTAw NjQ0Cj4gLS0tIGEvZ251L3BhY2thZ2VzL2NwcC5zY20KPiArKysgYi9nbnUvcGFja2FnZXMvY3Bw LnNjbQo+IEBAIC0yOSw3ICsyOSw3IEBACj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjIgbXVyYWRt IDxtYWlsQG11cmFkbS5uZXQ+Cj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjIgQXR0aWxhIExlbmR2 YWkgPGF0dGlsYUBsZW5kdmFpLm5hbWU+Cj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjIgQXJ1biBJ c2FhYyA8YXJ1bmlzYWFjQHN5c3RlbXJlYm9vdC5uZXQ+Cj4gLTs7OyBDb3B5cmlnaHQgwqkgMjAy MiBEYXZpZCBFbHNpbmcgPGRhdmlkLmVsc2luZ0Bwb3N0ZW8ubmV0Pgo+ICs7OzsgQ29weXJpZ2h0 IMKpIDIwMjIsIDIwMjMgRGF2aWQgRWxzaW5nIDxkYXZpZC5lbHNpbmdAcG9zdGVvLm5ldD4KPiDC oDs7OyBDb3B5cmlnaHQgwqkgMjAyMiwgMjAyMyBaaGVuZyBKdW5qaWUgPDg3MzIxNjA3MUBxcS5j b20+Cj4gwqA7OzsgQ29weXJpZ2h0IMKpIDIwMjIgTWF4aW0gQ291cm5veWVyIDxtYXhpbS5jb3Vy bm95ZXJAZ21haWwuY29tPgo+IMKgOzs7IENvcHlyaWdodCDCqSAyMDIzIFN1Z2hvc2hhIDxTdWdo b3NoYUBwcm90b24ubWU+Cj4gQEAgLTI1NTMsMyArMjU1MywzOCBAQCAoZGVmaW5lLXB1YmxpYyBm dHh1aQo+IMKgQGl0ZW0gTm8gZGVwZW5kZW5jaWVzLgo+IMKgQGVuZCBpdGVtaXplIikKPiDCoMKg wqDCoCAobGljZW5zZSBsaWNlbnNlOmV4cGF0KSkpCj4gKwo+ICsoZGVmaW5lLXB1YmxpYyBtcGFy ay12YXJpYW50Cj4gK8KgIChwYWNrYWdlCj4gK8KgwqDCoCAobmFtZSAibXBhcmstdmFyaWFudCIp Cj4gK8KgwqDCoCAodmVyc2lvbiAiMS40LjAiKQo+ICvCoMKgwqAgKHNvdXJjZSAob3JpZ2luCj4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChtZXRob2QgZ2l0LWZldGNoKQo+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAodXJpIChnaXQtcmVmZXJlbmNlCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh1cmwgImh0dHBzOi8vZ2l0aHViLmNvbS9tcGFyay92 YXJpYW50IikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1p dCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikpKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKHNoYTI1Ngo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChiYXNlMzIKPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgCj4gIjBnejhkNXFwcmxmcWI0MmNmeXljNG5i d2hnYXJodzAyN2E5bnI1MmgzZ2JkbjU2MGowajQiKSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZlcnNpb24pKSkpCj4gK8KgwqDC oCAoYnVpbGQtc3lzdGVtIGNtYWtlLWJ1aWxkLXN5c3RlbSkKPiArwqDCoMKgIChhcmd1bWVudHMK PiArwqDCoMKgwqAgKGxpc3QKPiArwqDCoMKgwqDCoCAjOmNvbmZpZ3VyZS1mbGFncyAjfihsaXN0 ICItCj4gRE1QQVJLX1ZBUklBTlRfSU5DTFVERV9URVNUUz1tcGFyayIpCj4gK8KgwqDCoMKgwqAg IzpwaGFzZXMKPiArwqDCoMKgwqDCoCAjfihtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMK PiArwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ3VucGFjayAnZmluZC1nb29nbGV0ZXN0 Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxhbWJkYSBfCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzdWJzdGl0dXRlKiAidGVzdC9DTWFrZUxpc3RzLnR4dCIKPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoImFkZF9zdWJkaXJlY3RvcnkuKjNyZHBhcnR5L2dvb2ds ZXRlc3QuKlxuIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImZpbmRfcGFj a2FnZShHVGVzdCBSRVFVSVJFRClcbiIpCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAoKCIuKjNyZHBhcnR5L2dvb2dsZXRlc3QuKlxuIikgIiIpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCAoKCIuKmNvbmZpZ19jb21waWxlcl9hbmRfbGlua2VyLipcbiIpICIiKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiZ3Rlc3RfbWFpbiIpICJndGVzdCBn dGVzdF9tYWluIikpKSkpKSkKPiArwqDCoMKgIChuYXRpdmUtaW5wdXRzIChsaXN0IGdvb2dsZXRl c3QpKQo+ICvCoMKgwqAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL21wYXJrL3Zhcmlh bnQiKQo+ICvCoMKgwqAgKHN5bm9wc2lzICJJbXBsZW1lbnRhdGlvbiBvZiB0aGUgQysrMTcgc3Rk Ojp2YXJpYW50IGZvcgo+IEMrKzExLzE0LzE3IikKQ291bGQgcHJvYmFibHkgYmUgc2hvcnRlbmVk IHRvIHN0ZDo6dmFyaWFudCBmb3IgQysrMTEvMTRbLzE3XQo+ICvCoMKgwqAgKGRlc2NyaXB0aW9u Cj4gK8KgwqDCoMKgICJNUGFyay5WYXJpYW50IHByb3ZpZGVzIHRoZSBDKysxNyBzdGQ6OnZhcmlh bnQgZm9yCj4gQysrMTEvMTQvMTcuwqAgSXQgaXMKPiArYmFzZWQgb24gdGhlIGltcGxlbWVudGF0 aW9uIG9mIHN0ZDo6dmFyaWFudCBpbiBsaWJjKysuIikKPiArwqDCoMKgIChsaWNlbnNlIGxpY2Vu c2U6Ym9vc3QxLjApKSkKCk90aGVyd2lzZSBMR1RNLgo= From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 00:18:31 2023 Received: (at 64137) by debbugs.gnu.org; 22 Jun 2023 04:18:31 +0000 Received: from localhost ([127.0.0.1]:34527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBmB-0006Ku-1K for submit@debbugs.gnu.org; Thu, 22 Jun 2023 00:18:31 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:45435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBm7-0006KV-Ui for 64137@debbugs.gnu.org; Thu, 22 Jun 2023 00:18:29 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-988b204ce5fso518847266b.3 for <64137@debbugs.gnu.org>; Wed, 21 Jun 2023 21:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687407501; x=1689999501; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=TLi/tvrOEsq7rDW/FnQo1zd39WUTH0gYcV60H/FANZ8=; b=LQPgoIdtv+FqXjnw7gC6DuyaI46bPya9ATijzOOhVvLrWeECXnbef4wWvG8qbej96a ftUlNj65Y9cexWVWLNkZs4BuOmqhoaSOS7sbfODPxIL9By8kK7bd+uK7JRfZsnJFGTYD nAme6GLQYYil1oM4d1uAd/5gh11ZRDSYTNBBgaf6mPFfupSR/sG1TpoRZoE+a2UR5e5M ptEr2tsVYkLPm6mvpcblNH8Hu1zaLNGAkhIqmcMu4zJupgDNsXhAbPhP8MqWLRL+TJU3 luoB4srE/rDxV8K7m3vVqmy/BAlp1azQWPnMDTGDbPZVP5B8WWocPGwuhEJoDaAARq6o 2QOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687407501; x=1689999501; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TLi/tvrOEsq7rDW/FnQo1zd39WUTH0gYcV60H/FANZ8=; b=N8/M5Ojhm8HJZISWfMu6W8yasESx0oh87WiEzk+XrJZsQNKcPEeDOfGcDmtyJLXnVO H8CmihBhNyyPF6ZU4Ss0oqFeQeJAhE6sbqvVNcw5eCwAOiIM1KYGj7IFe8jEuxSgsCD6 dXXLQNrvoWiBB+VxATx2ZRuLxCgGzEqBko7zyw0AEWK4Gkob3+4QlFJPrv7fX6wN8alZ Pn+GD5Ig7pPfSG1wdVPQRiZD9VfjXZvnYVzGVnMggbPhnriEEca7hkbw4WX1pIZJYXdD dTDBK3yVLGt1z9X3aOF66fdi0w/cWdtfup6osasZRwIZDj/Pj+amdj4/hAw8MLIuf0WW Zr4w== X-Gm-Message-State: AC+VfDzFQod5MyCg5KBVAHY2mu5gtg0YiRmp3J0OAXjV3luWLMndEaOj o5JpBLLHtRZX1xHKaslYtUQUokKYnB3TIw== X-Google-Smtp-Source: ACHHUZ4donDawgbz/qahEetGwV4HO7IwY6YU2mV0NUgtPNjFLwAzysqHgxh5OAgCQ4smgV1RRw5Hgg== X-Received: by 2002:a17:906:5d0d:b0:988:cbf5:3a80 with SMTP id g13-20020a1709065d0d00b00988cbf53a80mr9374100ejt.62.1687407501108; Wed, 21 Jun 2023 21:18:21 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id m12-20020a1709062acc00b00982b8cd7a44sm4024283eje.139.2023.06.21.21.18.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 21:18:20 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2 2/8] gnu: Add tsl-hopscotch-map. From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Thu, 22 Jun 2023 06:18:20 +0200 In-Reply-To: <68b5dda8fc0b5d59188cda3cf33f0f1537c6efed.1687121561.git.david.elsing@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> <68b5dda8fc0b5d59188cda3cf33f0f1537c6efed.1687121561.git.david.elsing@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) QW0gU29ubnRhZywgZGVtIDE4LjA2LjIwMjMgdW0gMjA6NTMgKzAwMDAgc2NocmllYiBEYXZpZCBF bHNpbmc6Cj4gKiBnbnUvcGFja2FnZXMvY3BwLnNjbSAodHNsLWhvcHNjb3RjaC1tYXApOiBOZXcg dmFyaWFibGUuCj4gLS0tCj4gwqBnbnUvcGFja2FnZXMvY3BwLnNjbSB8IDM1ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCj4gwqAxIGZpbGUgY2hhbmdlZCwgMzUgaW5zZXJ0aW9u cygrKQo+IAo+IGRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvY3BwLnNjbSBiL2dudS9wYWNrYWdl cy9jcHAuc2NtCj4gaW5kZXggNWE2Mjk4ZmM0ZC4uNzg3OGFhMmE2ZCAxMDA2NDQKPiAtLS0gYS9n bnUvcGFja2FnZXMvY3BwLnNjbQo+ICsrKyBiL2dudS9wYWNrYWdlcy9jcHAuc2NtCj4gQEAgLTI1 ODgsMyArMjU4OCwzOCBAQCAoZGVmaW5lLXB1YmxpYyBtcGFyay12YXJpYW50Cj4gwqDCoMKgwqDC oCAiTVBhcmsuVmFyaWFudCBwcm92aWRlcyB0aGUgQysrMTcgc3RkOjp2YXJpYW50IGZvcgo+IEMr KzExLzE0LzE3LsKgIEl0IGlzCj4gwqBiYXNlZCBvbiB0aGUgaW1wbGVtZW50YXRpb24gb2Ygc3Rk Ojp2YXJpYW50IGluIGxpYmMrKy4iKQo+IMKgwqDCoMKgIChsaWNlbnNlIGxpY2Vuc2U6Ym9vc3Qx LjApKSkKPiArCj4gKyhkZWZpbmUtcHVibGljIHRzbC1ob3BzY290Y2gtbWFwCj4gK8KgIChwYWNr YWdlCj4gK8KgwqDCoCAobmFtZSAidHNsLWhvcHNjb3RjaC1tYXAiKQo+ICvCoMKgwqAgKHZlcnNp b24gIjIuMy4wIikKPiArwqDCoMKgIChzb3VyY2UgKG9yaWdpbgo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoCAobWV0aG9kIGdpdC1mZXRjaCkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgKHVyaSAoZ2l0LXJlZmVyZW5jZQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAodXJsICJodHRwczovL2dpdGh1Yi5jb20vVGVzc2lsL2hvcHNjb3RjaC1tYXAiKQo+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29tbWl0IChzdHJpbmct YXBwZW5kICJ2IiB2ZXJzaW9uKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoZmls ZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChzaGEyNTYKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoYmFzZTMy Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoAo+ICIwMTJwdzM3dzAwMHBkeGR2cHMw d3Nxcnc2NTk3Y202aTZrcjVycGwzMDNxbWl3cWljYjJwIikpKSkKPiArwqDCoMKgIChidWlsZC1z eXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQo+ICvCoMKgwqAgKGFyZ3VtZW50cwo+ICvCoMKgwqDC oCAobGlzdAo+ICvCoMKgwqDCoMKgICM6cGhhc2VzCj4gK8KgwqDCoMKgwqAgI34obW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICd1 bnBhY2sgJ3BhdGNoLWNtYWtlLXRlc3QKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRh IF8KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGxldCAoKGZpbGUgKG9wZW4tZmlsZSAi Q01ha2VMaXN0cy50eHQiICJhIikpKQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGRpc3BsYXkKPiAiXG5lbmFibGVfdGVzdGluZygpXG5hZGRfc3ViZGlyZWN0b3J5KHRlc3RzKSIg ZmlsZSkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChjbG9zZS1wb3J0IGZpbGUp KQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogInRlc3RzL0NNYWtl TGlzdHMudHh0Igo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgic2V0XFwoQm9v c3RfVVNFX1NUQVRJQ19MSUJTLioiKSAiIikKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgICgoImFkZF9zdWJkaXJlY3RvcnlcXChcXC5cXC4uKiIpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgICJhZGRfdGVzdCh0c2xfaG9wc2NvdGNoX21hcF90ZXN0cwo+IHRzbF9o b3BzY290Y2hfbWFwX3Rlc3RzKVxuIikpKSkpKSkKPiArwqDCoMKgIChuYXRpdmUtaW5wdXRzIChs aXN0IGJvb3N0KSkKPiArwqDCoMKgIChob21lLXBhZ2UgImh0dHBzOi8vZ2l0aHViLmNvbS9UZXNz aWwvaG9wc2NvdGNoLW1hcCIpCj4gK8KgwqDCoCAoc3lub3BzaXMgIkMrKyBpbXBsZW1lbnRhdGlv biBvZiBhIGhhc2ggbWFwIGFuZCBoYXNoIHNldCB1c2luZwo+IGhvcHNjb3RjaCBoYXNoaW5nIikK U2hvdWxkIGJlIHNob3J0ZW5lZCB0byBmaXQgb24gYSBzaW5nbGUgbGluZS4KPiArwqDCoMKgIChk ZXNjcmlwdGlvbiAiVGhpcyBwYWNrYWdlIHByb3ZpZGVzIGEgQysrIGltcGxlbWVudGF0aW9uIG9m IGEKPiBoYXNoIG1hcCBhbmQKPiArYSBoYXNoIHNldCB1c2luZyBvcGVuLWFkZHJlc3NpbmcgYW5k IGhvcHNjb3RjaCBoYXNoaW5nIHRvIHJlc29sdmUKPiArY29sbGlzaW9ucy4iKQpUaGUgZGVzY3Jp cHRpb24gb3VnaHQgdG8gcHJvdmlkZSBhIGxpdHRsZSBtb3JlIGluZm9ybWF0aW9uIHRoYW4gdGhl CnN5bm9wc2lzIDopClNhbWUgYmFzaWNhbGx5IGhvbGRzIGZvciBwYWNrYWdlcyAzLi41LCBzbyBJ IHdvbid0IHJlcGVhdCBteXNlbGYuCgpDaGVlcnMK From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 00:19:42 2023 Received: (at 64137) by debbugs.gnu.org; 22 Jun 2023 04:19:42 +0000 Received: from localhost ([127.0.0.1]:34531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBnK-0006ND-Iw for submit@debbugs.gnu.org; Thu, 22 Jun 2023 00:19:42 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBnI-0006Mt-Jp for 64137@debbugs.gnu.org; Thu, 22 Jun 2023 00:19:41 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-518ff822360so8026159a12.1 for <64137@debbugs.gnu.org>; Wed, 21 Jun 2023 21:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687407575; x=1689999575; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=5cODCRHBRxXm+SX2WQGtLnFCDBcRxB2E2PRLxhjX6gM=; b=QysZQmJEOT/ti3idq7HUHLa2nyqEr2EyoEXBquA7vePg4pMVJ06Q23AUIE0FXXoUy5 sRsZMd0aZNw9TqR+EqB7/6WbBGtVRk2E210vgsHRTxAAzByyXu/wiYgn+w3/l//8EC1D 0nbtuXNzQFg1RRlPXX1j3NYFVWix2B5ADbEjEWZXAfDwbFGuj91PRt79YBqP5q3fXsQH hJgqVQBCXYXhpW26Us4R/jZm5/w+dsSJfiSgdIgBZftZSUuqlHxIC1fg0IHXmet85gJD YUgoRqWN5QsDuU7S5ROfq8AWFuIptiuXPPfSw+TI7Goc41enGXiwrGAviY1YLrNqmoiH wLjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687407575; x=1689999575; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5cODCRHBRxXm+SX2WQGtLnFCDBcRxB2E2PRLxhjX6gM=; b=gsl/QGT3JSsKlk7Gov3Pk/zTe47mKbfR0UjaeGkbIwhfZOgK96VS10Zztm6bxSdw2o Y6uxBoa/fj4c1U8Ku/vsBFLY1TIcoxXo48e4uTv5ZtCB+Js5oxG/i5+fn9ivoyZ6p0c5 1dLDRR1LO0uTry8H931CBxnL0egCGesy+Hp9BOBIfD4bCci+PCDNlmaOuABXSnK3ocOn 2YYaKjI3QSBQ3XubK30vkHW3hp0ieKx2bs/jNSOBY1V7DFZTXNATuaTXCELWQIXesIEG 7KP1TzKsgSzsj/n9e2CGxkkLAp+cTUFdndPrNp8+S6Rqids5qOsG2cT+DhcJUpm1vers vfiQ== X-Gm-Message-State: AC+VfDy0Xma9PTfS4fYg1+fnsJnExGcXotbLc51ux2kmS8O4TQNoQtPt t6asxhBRkyulhdoXUwVnjrQ= X-Google-Smtp-Source: ACHHUZ4ztqTCavjPUryIGcoKXCbM8Y81px47XpDt2FN7UJ4lAKf1h+8TYXfFHMD1zz6jiJiXgfn9zQ== X-Received: by 2002:aa7:c507:0:b0:51a:4ce1:750d with SMTP id o7-20020aa7c507000000b0051a4ce1750dmr7614189edq.26.1687407574816; Wed, 21 Jun 2023 21:19:34 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ju15-20020a17090798af00b009788554ad10sm4043908ejc.138.2023.06.21.21.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 21:19:34 -0700 (PDT) Message-ID: <0193bfb541881cd654e1347c3b4547c9530a14ad.camel@gmail.com> Subject: Re: [PATCH v2 6/8] gnu: clingo: Unbundle dependencies. From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Thu, 22 Jun 2023 06:19:33 +0200 In-Reply-To: References: <7yh6r4ebw2.fsf@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 18.06.2023 um 20:53 +0000 schrieb David Elsing: > * gnu/packages/potassco.scm: (clingo) > [arguments]<#:phases>: Patch CMakeLists.txt files to use external > dependencies. You can shorten this to (clingo)[#:phases] to not have the weird line break. > [native-inputs]: Add mpark-variant, tl-optional, tsl-hopscotch-map, > tsl-ordered-map and tsl-sparse-map. LGTM. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 00:20:20 2023 Received: (at 64137) by debbugs.gnu.org; 22 Jun 2023 04:20:20 +0000 Received: from localhost ([127.0.0.1]:34535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBnv-0006Os-VX for submit@debbugs.gnu.org; Thu, 22 Jun 2023 00:20:20 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:56780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBnu-0006Oe-6l for 64137@debbugs.gnu.org; Thu, 22 Jun 2023 00:20:18 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-5193c97ecbbso6871976a12.1 for <64137@debbugs.gnu.org>; Wed, 21 Jun 2023 21:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687407612; x=1689999612; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=7yjcSVaMas2lYMgoiuk85xntRh3sX9fgYF8/mCNA3UI=; b=HIrFTW4thX2+OJ1vQiMlvuShgMc6ZbkLbrehgu8/Fcuh5IsLYOBkn4xM80esl2m78s 4IqvqgvxOa7kzxm4SDCFWVPEEBp84zua3uOuNkb9O8EEPOtyeRl/YxmnS54ZlEpFIktS fodeGbYdY72S6RNSzaCWA2eppUjiDtqKodzgWLvisx8dOtTQ6r1/frceWWuBUROETPzq 3aTY437r+kEhtSCzG7RMSQaBf+Jc1op61wbX7PA+l1TU0WHrYUdafj9epi9Cglgz+Hri 3AT0GZJnXgZibfI5f9yc/tJZQizR48VBmxggamOZmEemd/Vc4wKc6FqZy+mifx2qgnLR hKwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687407612; x=1689999612; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7yjcSVaMas2lYMgoiuk85xntRh3sX9fgYF8/mCNA3UI=; b=eeXJBnkULEE2jVfa+U7CIwA5C7aMybWu5OwxhLWoUbHLgGI5+3yNAtR6UD4uC6G7g1 PhM5J5aXBefFwLtPfNZiO408MgkBB49dXTU7zSBt0A7EdlOHoKu6EVINGhddlQTpri+B dRXEXFSpRY0LZlViLQCpgeaUrclFm7roVVoEmKFOXwcRK8p7tPt5VVjg0QPDxdBxqX67 KNTR5lDQH4rj8+aQ5SPzHiv72Ar1Ux/6cIGMIKEZyeRsvg5Fm/xe+DzKOesQvAf7v7KY 7HpYHe8WxKWVha6BFLomA1lAxnn2M2SATivjMYjDMGAWB9GFD91W2fQCG1bd1mf80kv2 0XyA== X-Gm-Message-State: AC+VfDwHMs9BMQ51vHi43awzMm/olUhlthxYY+SF7IQynzMc0qF7gwWo Y5urpWBTjR6uKep96mWlOzaCSAHkJ10hOA== X-Google-Smtp-Source: ACHHUZ65IF84nfiy9bJ7BwhVJCVodAnWGr44TJgfAKPcOR2jAX43uZbYS7P0wytz66ndIfQGLPqEww== X-Received: by 2002:a17:907:1607:b0:96f:dd14:f749 with SMTP id hb7-20020a170907160700b0096fdd14f749mr15250925ejc.23.1687407612433; Wed, 21 Jun 2023 21:20:12 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a11-20020a170906274b00b009783791b1a1sm4003162ejd.121.2023.06.21.21.20.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 21:20:12 -0700 (PDT) Message-ID: <44c6344617007a2c9a88cd97b158f83ed78c7fad.camel@gmail.com> Subject: Re: [PATCH v2 7/8] gnu: catch2-3.1: Rename to catch2-3.3. From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Thu, 22 Jun 2023 06:20:11 +0200 In-Reply-To: <9438fc1bce335e6cac5297094722e746498d7f8d.1687121561.git.david.elsing@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> <9438fc1bce335e6cac5297094722e746498d7f8d.1687121561.git.david.elsing@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 18.06.2023 um 20:53 +0000 schrieb David Elsing: > * gnu/packages/check.scm (catch2-3.1): Rename to catch2-3.3. > * gnu/packages/potassco.scm (clingo): Adjust accordingly. This ChangeLog does not nearly explain the stuff that was changed in the patch. From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 22 00:24:19 2023 Received: (at 64137) by debbugs.gnu.org; 22 Jun 2023 04:24:19 +0000 Received: from localhost ([127.0.0.1]:34539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBrm-0006Xe-OR for submit@debbugs.gnu.org; Thu, 22 Jun 2023 00:24:18 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:46365) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qCBrk-0006XD-Ir for 64137@debbugs.gnu.org; Thu, 22 Jun 2023 00:24:17 -0400 Received: by mail-wm1-f65.google.com with SMTP id 5b1f17b1804b1-3f9c0abc8b1so14352335e9.1 for <64137@debbugs.gnu.org>; Wed, 21 Jun 2023 21:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687407850; x=1689999850; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ZhDFCUOyn4JLvyjeNPlzG8TEG9vwCgfDnVRYjWM2TWg=; b=FvY8B0VUjqjVzyI7+0mQBmP+nAGdQ2NGFeRNEB9tUEFK5g97S7aS078CHAh1PF/Xgb sACgbBJtnHG8yn47uTxjhXP2M8kBVMdKkGZvPTBazJYMYFruT2gbElTq8gmqahRexON+ 8Ea1FnrdL9oAMESaLGN8jhRHZy1CUVX2JCGrQ2hNJUeKJPLAjuLJLAsAUpIuHJ1iGmI5 GApCTjZ3tIJ//Oixaycs9owyZ+KnzjktiYJeWRdoq3ZxIK19FCb4urbCZqjLzmPEsksd eid2O97aR53IDt0uzx3sGuCqAOCUREZZJ/VFFAzy2y8kQzwdGi235QPZCGapY6LHe0rB Vk3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687407850; x=1689999850; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZhDFCUOyn4JLvyjeNPlzG8TEG9vwCgfDnVRYjWM2TWg=; b=hpy4IdkNsVrWa9rhLxcioLwZcLjHflOBHXxVBxro6BNGsJDQ870lEOo7tOUloKDerr kIofC6RarNtYmOandx9q2m3lTxDSwEaKdoBZbFkf863ov9fuXMyIxEUt8UmNWXQb+eS1 bGthqa0qRN+mSVsUSAvoHKsB5eDpBPQ7G/HJ/WWAuOPLHk902jB4cxy1vViOr2+jdBbK 3u8Q5kny9hOP3d47YjvgE8KfHJ59ODdVnKHElwenPLR1JUVqdyQlFG1O7+xbCck8OsV3 FPryFhQganTXEUiVTJySlilFgMDPnFZ2v7bFDwqU4hxbLkaLVGcFDO10VnpE3o86ul1S fBkQ== X-Gm-Message-State: AC+VfDxP12XXuoJAprkJWQ+9MchodBPDHweMXOOvNIW14woAyURd+C7W kW5mHMj2SO9uUMTvXoRtWSnv0MylY5V9zg== X-Google-Smtp-Source: ACHHUZ4KXGNmZWv/ZPZ7uNJUhovIqaems0muQuWFngWR67Codih9xBzlgg2N6cVxXT1aQcyJysDr6A== X-Received: by 2002:a05:600c:2051:b0:3f7:3545:4630 with SMTP id p17-20020a05600c205100b003f735454630mr17036775wmg.20.1687407849865; Wed, 21 Jun 2023 21:24:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id f20-20020a7bcd14000000b003f7f2a1484csm6597676wmj.5.2023.06.21.21.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 21:24:09 -0700 (PDT) Message-ID: Subject: Re: [PATCH v2 8/8] gnu: Add catch2-static-3.3. From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Thu, 22 Jun 2023 06:24:08 +0200 In-Reply-To: <7432e21c6c2f8221afbee755366eb9f74bcd41b9.1687121561.git.david.elsing@posteo.net> References: <7yh6r4ebw2.fsf@posteo.net> <7432e21c6c2f8221afbee755366eb9f74bcd41b9.1687121561.git.david.elsing@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 18.06.2023 um 20:53 +0000 schrieb David Elsing: > * gnu/packages/check.scm (catch2-static-3.3): New variable. Having an extra package for static catch seems overkill to me. Since afaik there are no actual users, you can simply omit this patch, but if you do have a use case for static catch, I highly recommend going with the current meson approach, as CMake seems unable to do both_libraries. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:01:57 2023 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:01:57 +0000 Received: from localhost ([127.0.0.1]:42026 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMZA-0000El-TY for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:01:57 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMZ6-0000EP-T0 for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:01:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A8CA6240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:01:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687306; bh=JZd7yhxRZv7Z1aX4uYcfXIaONq7u86BMpYWxKhHoRBY=; h=From:To:Subject:Date:Message-ID:MIME-Version:From; b=eZcGMHY9uMCHBiHcCfzWPwKNSPZNrhmpkIyJ5A4kzyRt09G4RS/YtMqRmLqzYgLtZ 6pId/LewAZ9yNMdVcKnj+ZjD/zmJPcPISQmN3KAz130kTYFMYybFNGv4Se8fdi6rSj AAplIviSfotaHlZr4uP1X3zd1eykxDsgW1WwUhmwcLocfn8mCb6W7I/n3eTJTFny8J D/P03sQOXZol6i71xyR6gwu7oGP8PSy2IZ92RVstvCAW4H5QLdtYrqMVN+MI3td3eg BCNyNuw+AFa8jGq8IFp2Xlk108yXD+NY6ZEitL8elt+zDMS7CKkzL8pWNCZk7i6fyC 3ZEqs7BltV0Hg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qpmj544X6z9rxL; Sun, 25 Jun 2023 12:01:45 +0200 (CEST) From: David Elsing To: Liliana Marie Prikler , 64137@debbugs.gnu.org Subject: Re: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 In-Reply-To: <7yh6r4ebw2.fsf@posteo.net> References: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> <7yh6r4ebw2.fsf@posteo.net> Date: Sun, 25 Jun 2023 10:01:42 +0000 Message-ID: <7yo7l3x3ll.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Thanks for your comments, here are the updated patches. I removed the cmake-static package as I also don't have any need for it. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:22 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 1/7] gnu: Add mpark-variant. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:28 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 2/7] gnu: Add tsl-hopscotch-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:31 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 3/7] gnu: Add tsl-sparse-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:38 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 4/7] gnu: Add tsl-ordered-map. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:43 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 5/7] gnu: Add tl-optional. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:47 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 6/7] gnu: clingo: Unbundle dependencies. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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.") -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 06:04:51 2023 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 To: 64137@debbugs.gnu.org Subject: [PATCH v3 7/7] gnu: catch2-3.1: Rename to catch2-3.3 and update to 3.3.2. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 25 12:06:56 2023 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 16:06:56 +0000 Received: from localhost ([127.0.0.1]:43284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDSGO-0004TQ-AC for submit@debbugs.gnu.org; Sun, 25 Jun 2023 12:06:56 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDSGJ-0004TB-Un for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 12:06:55 -0400 Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-3f9bdb01ec0so30843825e9.2 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 09:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687709206; x=1690301206; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J6x+qc85w5swzn7TvxxQAg13J/WthaJM8yikuBp9SUs=; b=fasRIYH6WfNcp37FKBCoxF5edBdlpmu7OBlxlXwMItG2SOmiW7RPlSyTNLmVUwukIq p3Fn0w/9DkwCK25yk7C7A+wLRRUQ7fl1Ynl3AxVs+uQIUeXWLhroQJXbwXGpZQBhDqn2 tyLIPa22YrCEqrvpShYtjBXLX716PQEGgDnKfVFmzm2U9II0WRHYuYcwRZNK/YU2UqJC X/qtwCD8VgF3LbmAfKoGVZKR3pOSH+eLD9aw75D7XkdnB9mjp66HqUtYvv/wBDlFxbPh M0b+/yuYqiep9j5rukBPggjbUnl3bbYA9duc6BLaEfV0E0RGRQOamQZ0vID3hvsYHAAE xSog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687709206; x=1690301206; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=J6x+qc85w5swzn7TvxxQAg13J/WthaJM8yikuBp9SUs=; b=IlVM46vCje0SYaI6oOhdwaGFh2J9p1etjkTQAZifX7XiRZIA/vALBWIEZNofPNjnTC luLaLmvbazgHwvQjeQz8EBFKdqcPDdold+tp2oTTttuplWPU/5jpBmrxTZtdSjjcuyjp n1cIrtRXuHAPFagez7K2wogSHmtBx5tIRxCn+kfRm4QxTZ3V/UOt57/CmahpYg1Ig0xp huce1C+Va6P7Jvwo6fA0ne7jYIPTrfgSWplcg6Ewu06YhQw6xvUlY6KgkqCnoQO/1hCS R4X29Iv1Ys1oQ4K2bPUNlTKe56lTGz0/6K00+O4BSjsVCmNrCQPNgf1BCs7hMXKzACjk anfA== X-Gm-Message-State: AC+VfDwwjq4DLBfXZLXzG8TBgaKzNRaeDgNu5DNPCe5I8HabBLfxGE7G OLBwqsVa/lMa5rixivWvdCeJdRSvKZ/fKA== X-Google-Smtp-Source: ACHHUZ4W4eab+vuvtxNXJuykdqjA7CyE5hTcocrm5eGiE+KNgKg8sFTGQrP6jAoVzdAEWlDoL6SGJQ== X-Received: by 2002:a7b:c846:0:b0:3f7:3991:e12e with SMTP id c6-20020a7bc846000000b003f73991e12emr22382666wml.1.1687709206016; Sun, 25 Jun 2023 09:06:46 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n10-20020a1c720a000000b003fa96620b23sm425273wmc.12.2023.06.25.09.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 09:06:45 -0700 (PDT) Message-ID: Subject: Re: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 From: Liliana Marie Prikler To: David Elsing , 64137@debbugs.gnu.org Date: Sun, 25 Jun 2023 18:06:44 +0200 In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> <7yh6r4ebw2.fsf@posteo.net> <7yo7l3x3ll.fsf@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 25.06.2023 um 10:01 +0000 schrieb David Elsing: > Thanks for your comments, here are the updated patches. I removed the > cmake-static package as I also don't have any need for it. Thanks for the updates. I do have some minor changes for the synopses and descriptions, but nothing major. I'll push them once CI lights green or next weekend :) From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 28 12:51:42 2023 Received: (at 64137) by debbugs.gnu.org; 28 Jun 2023 16:51:42 +0000 Received: from localhost ([127.0.0.1]:51532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEYOM-000709-1G for submit@debbugs.gnu.org; Wed, 28 Jun 2023 12:51:42 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46131) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qEYOJ-0006zu-Jf for 64137@debbugs.gnu.org; Wed, 28 Jun 2023 12:51:41 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id BB2A5240103 for <64137@debbugs.gnu.org>; Wed, 28 Jun 2023 18:51:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687971092; bh=JR1TEyaIym/ysUN5QvAd8mNdoVvcP2ae5iPVohS4GGo=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=WF1mEv595zgadTRxbd7iNr9PQSP73MYSTaL0iVbneuIOr80dvI/8IkbDhkYM4P6TQ eXs/iqMigQ3Un7AjxPM4uub4raia67a/IRKUqu8ag9kTVN+EALj+o+7Ro1Up/KUX80 ioI9HXgX9D7sjVmvpJ64Xst2FfIQPUnq8lCytXiuymoBVVdaJkFoSG0thYPXNa1Hb7 lK+15GHO0TyLz6HFnGdD9BDcFre9aWy+I9IiDHV+ig2JCK8YzYa3/Vau8Q9hrRwvEP eco4gBhIn6LWdK9mrRFRxPxSXtete/2SXz9ZCBLG61uuXjsEhcCv8yzuN5mTi7KBxp dlO56Q7wOKKLQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QrnfX1XTgz9rxN; Wed, 28 Jun 2023 18:51:32 +0200 (CEST) From: David Elsing To: 64137@debbugs.gnu.org Subject: [PATCH v4] gnu: catch2-3.1: Rename to catch2-3.3 and update to 3.3.2. Date: Wed, 28 Jun 2023 16:51:29 +0000 Message-Id: <9086a0773d8379158be18a00ed36c76b30d8f0ee.1687971076.git.david.elsing@posteo.net> In-Reply-To: <7ycz1f350w.fsf@posteo.net> References: <7ycz1f350w.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64137 Cc: David Elsing X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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..0d4c117f6f 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" + "-DCATCH_ENABLE_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 -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 01 06:41:49 2023 Received: (at 64137-done) by debbugs.gnu.org; 1 Jul 2023 10:41:49 +0000 Received: from localhost ([127.0.0.1]:56708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFY33-0000m6-0i for submit@debbugs.gnu.org; Sat, 01 Jul 2023 06:41:49 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:47611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFY31-0000lm-Ib for 64137-done@debbugs.gnu.org; Sat, 01 Jul 2023 06:41:48 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-51d91e9b533so2949988a12.3 for <64137-done@debbugs.gnu.org>; Sat, 01 Jul 2023 03:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688208101; x=1690800101; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=sv9zQa6SVwoajJFPwv5NNppsYFaE2o7mNnyfQSpJnhM=; b=kPER796iqw+zDMZnmxpJsmPBWZdesO4FIZTLc4e2E4yzHYn42o0SgmQQmMmeojMY3a 7k9SHGDrFMrp1CRi3L6HTKCQJIa7ks0uKxoF6+q2rn1YA+LfZFqWwyK9PTO846FtUjvs ZG81kC6GuL3O8Pku8uohlBUFcyplX6/tsqWl70uMhunlbOgVcjGnXVIUP0f3RXQ0fKXS eWOS0dXef5ILAbmoAXdbMPxYKoNAugpw05Se1DjbwCdSwu9o/3W1O/nurSLw4rSUR4nF EjnxYnk2gxhJt1QU8yEM6T91xqcWo6qPUkLDI21Ig2Aour0GWY39P8+kLpnRldQbFmeX oKyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688208101; x=1690800101; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sv9zQa6SVwoajJFPwv5NNppsYFaE2o7mNnyfQSpJnhM=; b=PvfzdbCPLIdDfnA5ZQPV/wgBa/q3wZ8NCoNodj99UbwiALRut5OA2r7gvx73GxgR72 QMVU1b4Nj96nVxdh3DA7yEk4ORDObD91GeEF6Rfa7ZizgH+2vGWEqJ8eAy83ksZboNy3 UR4Q1J0SL55r2D9RLNhQ3xTGlAbiA9uTadKgqKdb9Ai549YsCeGKlClK253/mMR+4Lec GdkCzhMi/Lg40sbe4xWBJl3GdwNIOwbgHgQFa7yeoA5csS0L1RD2oxhJMX8jvV2ky7hi jMpG5Oa6GPIZVMKBSLRQzitcPrz8t6f6HNMETS8hDmnaDLKA6Co+bqft/Gos740N1AD+ PZzA== X-Gm-Message-State: ABy/qLZQMeogxI9Ue511wqWZfGYFIoxCXh+VXc4hHk78gVfEuSqH49S+ e+HsBBu7pvyYMvKFYwGuayI= X-Google-Smtp-Source: APBJJlFOf7DpspQsmyNMdY0rrIlLXHqz9yJzZGagfDIEs/OXdagKar8YcznBg/5D5TO4b5/7Ga9Hbg== X-Received: by 2002:a05:6402:2050:b0:51d:9399:4707 with SMTP id bc16-20020a056402205000b0051d93994707mr2987711edb.26.1688208101316; Sat, 01 Jul 2023 03:41:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e12-20020a056402088c00b0051e0310f5d4sm314630edy.70.2023.07.01.03.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jul 2023 03:41:40 -0700 (PDT) Message-ID: Subject: Re: [PATCH 0/2] Build catch2@3 with CMake and update to 3.3.2 From: Liliana Marie Prikler To: David Elsing Date: Sat, 01 Jul 2023 12:41:12 +0200 In-Reply-To: <7ycz1f350w.fsf@posteo.net> References: <6d6d3fcc6d73630e1580e21784f76b968f66ec74.camel@gmail.com> <7yh6r4ebw2.fsf@posteo.net> <7yo7l3x3ll.fsf@posteo.net> <7ycz1f350w.fsf@posteo.net> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64137-done Cc: 64137-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 28.06.2023 um 16:50 +0000 schrieb David Elsing: > Liliana Marie Prikler writes: >=20 > > Am Sonntag, dem 25.06.2023 um 10:01 +0000 schrieb David Elsing: > > > Thanks for your comments, here are the updated patches. I removed > > > the > > > cmake-static package as I also don't have any need for it. > > Thanks for the updates.=C2=A0 I do have some minor changes for the > > synopses and descriptions, but nothing major.=C2=A0 I'll push them once > > CI lights green or next weekend :) > Ok, thanks! > On armhf-linux, there is an error (warning) from -Werror=3Dcast-align > because an unsigned char* is cast to std::string*, but this is fine > because the unsigned char array it points to is declared with > alignas. I accidentally set -DENABLE_WERROR=3DOFF instead of > -DCATCH_ENABLE_WERROR=3DOFF, but now the build succeeds. Pushed and followed up with a commit that does that. Cheers From unknown Fri Aug 15 03:38:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 29 Jul 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator