From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aFFpN0hlnGQ3+QAASxT56A (envelope-from ) for ; Wed, 28 Jun 2023 18:52:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iBuFNkhlnGTWYQAAG6o9tA (envelope-from ) for ; Wed, 28 Jun 2023 18:52:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 90E9039DD7 for ; Wed, 28 Jun 2023 18:52:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEYOh-0002j6-IF; Wed, 28 Jun 2023 12:52:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEYOg-0002is-II for guix-patches@gnu.org; Wed, 28 Jun 2023 12:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qEYOg-0007St-9g for guix-patches@gnu.org; Wed, 28 Jun 2023 12:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qEYOg-00070h-5J for guix-patches@gnu.org; Wed, 28 Jun 2023 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64137] [PATCH v4] 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: Wed, 28 Jun 2023 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64137 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64137@debbugs.gnu.org Cc: David Elsing Received: via spool by 64137-submit@debbugs.gnu.org id=B64137.168797110226921 (code B ref 64137); Wed, 28 Jun 2023 16:52:02 +0000 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 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687971144; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=gWEOxl/15bI7KQi6hUY1nR7q90Ti6QZOgvMjdLpxs3k=; b=uGgtClZZ882efk4CG93Lu4FFPDww7OYCDz0vEeCb3dJAD6AcktoLjzeuX/udTApyamuXs2 vXEgLlf4BKuTPjoA2HrybwEkKmKMpDmtvabJFK9dxZUfafBzle7kW1DymNZWiI3bt9Spk8 YDykXJnez1pdzLgHRV+sKUn4/F/sydEiqfykXFWVChnkee//zM9AjqDgLzioxb7d9G+AjC 5DK09XjPhvnHx9nxTjN4B1z/Noi87lj+fIrPclXNv0AZv2N2SDlgkJ1puSkcBn3VjT1csy S5zJorsLMkT8MMy0EtDsz/vinJfOdDSY14wHBawtwK3wvReHZWPi6ahF6z6B8Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=WF1mEv59; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687971144; a=rsa-sha256; cv=none; b=edHTiYhp4C5I7ESqXzPbzdyH5DRYGDvO5YsToQ0Q45iDfBzrt4G8KCkFrme6AQy3nquMav b2TxFEUR/uJe6NAUf6GLRm/8y7osAR+6hrOAEKvduJyEXxi0qtO4bx0j93hWu3WFU0Rkd6 ooK3f4AkD3a6WhAiDoAQ9Nyu2oi06yPeUS/rP1aFtmT/cphHFIARyr+OTLporl82WAPNMP kWbtTM1iswelxXDqcvn788/mJINhIO1NCHKbFxQEA8TL3WdVUx6m1H5p5F2sQ6BeHtM13W FUG8R4Lk20mU5FN8rao+nvZiTOTyTAfapEdtcQj40E5S+0DMdIzmB9lcry4SwA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.35 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=WF1mEv59; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 90E9039DD7 X-Spam-Score: -1.35 X-TUID: AnIc4ZDnssaI * 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