From patchwork Sun Jun 25 10:03:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 51274 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8750727BBE9; Sun, 25 Jun 2023 11:05:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 547CD27BBE2 for ; Sun, 25 Jun 2023 11:05:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDMcF-0002tn-TW; Sun, 25 Jun 2023 06:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qDMcD-0002sM-Ik for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qDMcD-0008Sb-9K for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDMcD-0000Ll-4O for guix-patches@gnu.org; Sun, 25 Jun 2023 06:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v3 7/7] gnu: catch2-3.1: Rename to catch2-3.3 and update to 3.3.2. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jun 2023 10:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.16876874921272 (code B ref 64137); Sun, 25 Jun 2023 10:05:05 +0000 Received: (at 64137) by debbugs.gnu.org; 25 Jun 2023 10:04:52 +0000 Received: from localhost ([127.0.0.1]:42055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbz-0000KR-Cw for submit@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:51 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDMbu-0000Js-Ed for 64137@debbugs.gnu.org; Sun, 25 Jun 2023 06:04:47 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E9E71240027 for <64137@debbugs.gnu.org>; Sun, 25 Jun 2023 12:04:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687687480; bh=eNjWjoMO6RC1gA4uvo9MgpW8L9+4NUUcpwwQgiPB7QA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=cL95VIypJpc6DQsGfAsPZxUJa+gRVM0EzQGmbHaLWEVzG0qCEwo5zY+5ATJawi//A 8lxKHvt1qFbiVQsrEbWJcAIuVj+8ok+LywqeOObbG/2kDqzuiB88LgmE6UDN8TeLG6 y6O25TGn5Xba1ZhgeioxwPJP5I9+vmVuZoumnT6HNQXBkbojHEtM0g2eZrxXASe26t Zpcw53APB/pHBF8cMMMYvyM2VesEAH8LDTviPEYoZuB1Td2eWY9TpuhUcQkk4uyLVD k/c/j1OcfNFZk3HC4TxufBIPdbjE6jnKVwHYOIHcKbLxaD4XWZQQrRkjs8rHPAgNlj mK6FrS3yhCijA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QpmmR2F1Dz6tw4; Sun, 25 Jun 2023 12:04:39 +0200 (CEST) From: David Elsing Date: Sun, 25 Jun 2023 10:03:59 +0000 Message-Id: In-Reply-To: <7yo7l3x3ll.fsf@posteo.net> References: <7yo7l3x3ll.fsf@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (catch2-3.1): Rename to catch2-3.3 and update to 3.3.2. [outputs] Only use 'out' output. [build-system] Use cmake-build-system. [arguments]: Remove special phases. Add CMake options to #:configure-flags. * gnu/packages/potassco.scm (clingo): Adjust accordingly. --- gnu/packages/check.scm | 70 +++++---------------------------------- gnu/packages/potassco.scm | 2 +- 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 87728fefa3..512b2ac070 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos -;;; Copyright © 2022 David Elsing +;;; Copyright © 2022, 2023 David Elsing ;;; Copyright © 2022 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo @@ -596,10 +596,10 @@ (define-public cbehave pattern.") (license license:apsl2)))) -(define-public catch2-3.1 +(define-public catch2-3.3 (package (name "catch2") - (version "3.1.1") + (version "3.3.2") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -609,66 +609,14 @@ (define-public catch2-3.1 (file-name (git-file-name name version)) (sha256 (base32 - "1qnr5b3zq8brh43f924rgnw5gmmjf9ax7kbq2crz1mlwgmdymxlp")))) - (outputs (list "out" "static")) - (build-system meson-build-system) + "0m6i3lr0qk303ashjpz5vpwmxf76n5d6s8jq6r6kcy6gph525zmp")))) + (build-system cmake-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-meson - (lambda _ - (substitute* "src/catch2/meson.build" - (("static_library") "both_libraries")))) - (add-after 'install 'install-cmake-config - (lambda* (#:key outputs #:allow-other-keys) - (define prefix (string-append (assoc-ref outputs "out") - "/lib/cmake/Catch2/")) - (mkdir-p prefix) - (call-with-output-file (string-append - prefix - "catch2-config-version.cmake") - (lambda (port) - (format - port - "set(PACKAGE_VERSION ~s)~@ - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)~@ - set(PACKAGE_VERSION_EXACT TRUE)~@ - set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ - elseif(PACKAGE_FIND_VERSION VERSION_LESS_EQUAL ~ - PACKAGE_VERSION)~@ - set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ - else()~@ - set(PACKAGE_VERSION_COMPATIBLE FALSE)~@ - endif()" - #$version))) - (call-with-output-file (string-append prefix - "catch2-config.cmake") - (lambda (port) - (format - port - "include(FindPkgConfig)~@ - pkg_check_modules(CATCH2 IMPORTED_TARGET GLOBAL catch2)~@ - pkg_check_modules(CATCH2MAIN ~ - IMPORTED_TARGET GLOBAL ~ - catch2 catch2-with-main)~@ - if(CATCH2_FOUND)~@ - add_library(Catch2::Catch2 ALIAS PkgConfig::CATCH2)~@ - endif()~@ - if(CATCH2MAIN_FOUND)~@ - add_library(Catch2::Catch2WithMain ~ - ALIAS PkgConfig::CATCH2MAIN)~@ - endif()"))))) - (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (for-each - (lambda (file) - (install-file file (string-append static "/lib")) - (delete-file file)) - (find-files (string-append out "/lib") - "\\.a$")))))))) + #:configure-flags + #~(list "-DCATCH_DEVELOPMENT_BUILD=ON" + "-DENABLE_WERROR=OFF" + "-DBUILD_SHARED_LIBS=ON"))) (inputs (list python-wrapper)) (synopsis "Automated test framework for C++ and Objective-C") (description "Catch2 stands for C++ Automated Test Cases in Headers and is diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index b8e51e7d47..4e7d715e39 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -209,7 +209,7 @@ (define-public clingo "unpool-ast-v2" "parse_term" "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) - (inputs (list catch2-3.1 clasp libpotassco)) + (inputs (list catch2-3.3 clasp libpotassco)) (native-inputs (list mpark-variant pkg-config tl-optional