From patchwork Wed Feb 14 15:36:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 60305 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 6904027BBE9; Wed, 14 Feb 2024 15:37:12 +0000 (GMT) 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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DD33C27BBE2 for ; Wed, 14 Feb 2024 15:37:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raHJa-0006m1-Ly; Wed, 14 Feb 2024 10:36:50 -0500 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 1raHJU-0006jV-80 for guix-patches@gnu.org; Wed, 14 Feb 2024 10:36:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1raHJU-00057f-02 for guix-patches@gnu.org; Wed, 14 Feb 2024 10:36:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raHJm-0003Mn-2Y for guix-patches@gnu.org; Wed, 14 Feb 2024 10:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69126] [PATCH 1/2] gnu: Add debug-assert. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Feb 2024 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69126@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 69126-submit@debbugs.gnu.org id=B69126.170792500812908 (code B ref 69126); Wed, 14 Feb 2024 15:37:02 +0000 Received: (at 69126) by debbugs.gnu.org; 14 Feb 2024 15:36:48 +0000 Received: from localhost ([127.0.0.1]:52818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raHJX-0003M7-Oo for submit@debbugs.gnu.org; Wed, 14 Feb 2024 10:36:48 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:50919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raHJV-0003Lt-2j for 69126@debbugs.gnu.org; Wed, 14 Feb 2024 10:36:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1707924980; x=1708184180; bh=+/fvejRtlnpThsbW+RH0UD564o9BAb8gSeVfKxOCwN8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=U4ok/w5y7dLkYL1Rt/mjsBd4CFuWUzj+TUti+y/HOoCds5wafCNTgYWV5PwtJIl3t jLnKlrC4rRjgTzGhwu5l8GiVAHTHUpiMdcJBPJp9Kx+u+UJiodWTIjg3vQ1GqACoCf MC6AMKW6xlRL0KKrk50Bk9v+hvCZM31YpSRT4iAfuDMso3aKxF1PkHZn620TMvKg2J U+vlbwiMRtCJn8GEP8dHy40d/++xe6KBdM9MzUKSdOJIaW1+iMdf+8nigmP5TQFyuS f9YDTHDqSfJcEV36JFqrtEM4nV8mKxCyh6RjwxEp6hzHy7HHzHp7BaC5XIz+o6MvCx Nxsa9ytfLQFOw== Date: Wed, 14 Feb 2024 15:36:15 +0000 From: "Paul A. Patience" Message-ID: <0191a95edf076b5cd24326d49e54ce13f2bdb0d4.1707924715.git.paul@apatience.com> In-Reply-To: References: Feedback-ID: 19227857:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (debug-assert): New variable. Change-Id: I4cee49ea2f5b761ab72bb7b063c2ea8fd99b991c --- gnu/packages/cpp.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 62a1923571..2456de5002 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2023 Liliana Marie Prikler ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Foundation Devices, Inc. -;;; Copyright © 2023 Paul A. Patience +;;; Copyright © 2023-2024 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -3048,3 +3048,29 @@ (define-public tl-optional the std::optional for C++11/14/17, with support for monadic operations added in C++23.") (license license:cc0))) + +(define-public debug-assert + ;; Newer version than last release, which was in 2018, is required for + ;; type_safe. + (let ((commit "d33781479baccf52a28e5c3c5a6da5ac59b09179") + (revision "0")) + (package + (name "debug-assert") + (version (git-version "1.3.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/foonathan/debug_assert") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0njbzx767pndpl8hq5falr4c8m0xsr6njh0943xf8xkcqq6splpz")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) ; no tests + (home-page "https://github.com/foonathan/debug_assert") + (synopsis "Assertion macro for C++") + (description "debug_assert is a C++11 header-only library which provides the +@code{DEBUG_ASSERT()} macro, which among other features can be selectively +enabled in different parts of your code.") + (license license:zlib)))) From patchwork Wed Feb 14 15:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 60304 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 160A727BBEA; Wed, 14 Feb 2024 15:36:59 +0000 (GMT) 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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 32C4527BBE2 for ; Wed, 14 Feb 2024 15:36:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raHJY-0006lb-5C; Wed, 14 Feb 2024 10:36:48 -0500 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 1raHJU-0006jX-Lb for guix-patches@gnu.org; Wed, 14 Feb 2024 10:36:45 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1raHJU-00057t-Dc for guix-patches@gnu.org; Wed, 14 Feb 2024 10:36:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raHJm-0003Mu-GD for guix-patches@gnu.org; Wed, 14 Feb 2024 10:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69126] [PATCH 2/2] gnu: Add type-safe. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Feb 2024 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69126@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 69126-submit@debbugs.gnu.org id=B69126.170792502112940 (code B ref 69126); Wed, 14 Feb 2024 15:37:02 +0000 Received: (at 69126) by debbugs.gnu.org; 14 Feb 2024 15:37:01 +0000 Received: from localhost ([127.0.0.1]:52822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raHJl-0003MY-68 for submit@debbugs.gnu.org; Wed, 14 Feb 2024 10:37:01 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:33573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raHJj-0003MK-ME for 69126@debbugs.gnu.org; Wed, 14 Feb 2024 10:37:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1707924995; x=1708184195; bh=NJPHwNPMh3Y5lzBkhQmBk/NC8RtQvcO/EHqsq1Zn+I8=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=H+/JwC+yzYmcg32PvFqytnRyzhJW6dR5pop7QxTcJUROx4M81aWGXfTnyOC5mCBl5 Ta14zpldRQ9bPAYU5VPxi8E+VmsawSS/uAw8zUhe21Cvgj6IAI4/JcmwE3kshaVXzN bFQU+r32jDBWbZaVI4DLJ7R6fSU7fWd5q7WvOyMTiGF8E9kVGeq23UNOOIa2yugLUS eZcomW07MliSC4lxLbpNuh/JVTKSXLhjGxO+oVSkrWc5fdtMA2ubaZkgZq3jgxYbJC Mza9pT3uKEBLd40I030snfd+KhWIy/rSxIS9sYjgfhSQA27SQFX0GU0Ysuli3Ur/5A 6sxmN6T9j4KaA== Date: Wed, 14 Feb 2024 15:36:20 +0000 From: "Paul A. Patience" Message-ID: In-Reply-To: References: Feedback-ID: 19227857:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (type-safe): New variable. Change-Id: I96a690b41af78e331744daacba1cf5ee77f8257a --- gnu/packages/cpp.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2456de5002..cf0771e470 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3074,3 +3074,56 @@ (define-public debug-assert @code{DEBUG_ASSERT()} macro, which among other features can be selectively enabled in different parts of your code.") (license license:zlib)))) + +(define-public type-safe + (package + (name "type-safe") + (version "0.2.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/foonathan/type_safe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ijd5grkbzfcmkqydka5ncl7ab4rc3307qr0ywwgzqsifr3ks0fd")) + (modules '((guix build utils))) + ;; Remove bundled debug_assert. + ;; Keep external/external.cmake because it enables + ;; TYPE_SAFE_HAS_IMPORTED_TARGETS, required for installing the CMake + ;; config files. + (snippet #~(delete-file-recursively "external/debug_assert")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DTYPE_SAFE_BUILD_TEST_EXAMPLE=ON" + "-DTYPE_SAFE_BUILD_DOC=OFF") ; needs standardese + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-dependencies + (lambda _ + (substitute* "test/CMakeLists.txt" + (("^if\\(NOT EXISTS .*/catch\\.hpp\\)") "if(FALSE)") + (("^(target_include_directories\\(type_safe_test) .*" + all prefix) + (string-append all prefix " PRIVATE \"" + #$(this-package-native-input "catch2") + "/include/catch2\")\n"))))) + (add-after 'install 'fix-cmake-config + (lambda _ + (substitute* (string-append + #$output + "/lib/cmake/type_safe/type_safe-config.cmake") + (("^(find_dependency\\(debug_assert)\\)" _ prefix) + (string-append prefix " PATHS \"" + #$(this-package-input "debug-assert") + "/lib/cmake/debug_assert\")")))))))) + (native-inputs (list catch2)) + (inputs (list debug-assert)) + (home-page "https://github.com/foonathan/type_safe") + (synopsis "C++ abstractions for preventing bugs via the type system") + (description "type_safe is a C++ header-only library which provides +abstractions for defining more appropriate types, thus allowing C++'s type +system to prevent more bugs.") + (license license:expat)))