This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new acfae8df4b gnu: tcbrindle-span: Patch missing header.
acfae8df4b is described below
commit acfae8df4bc049722d1666619d8263d72779179c
Author: Gábor Udvari <[email protected]>
AuthorDate: Mon Aug 31 22:56:21 2026 +0200
gnu: tcbrindle-span: Patch missing header.
In case TCB_SPAN_NO_EXCEPTIONS is defined,
The <exception> header is needed for std::terminate
* gnu/packages/patches/tcbrindle-span-include-exception.patch: New file.
* gnu/packages/cpp.scm (tcbrindle-span)[source]<patches>: Add it.
* gnu/local.mk (dist_patch_DATA): Register it.
Merges: https://codeberg.org/guix/guix/pulls/10947
Reviewed-by: bdunahu <[email protected]>
Signed-off-by: Nguyễn Gia Phong <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/cpp.scm | 1 +
.../patches/tcbrindle-span-include-exception.patch | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1a8720459d..c2889ac22f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2559,6 +2559,7 @@ dist_patch_DATA =
\
%D%/packages/patches/taskwarrior-link-taskchampion-cpp-with-sqlite3.patch \
%D%/packages/patches/tbb-gcc-14.patch \
%D%/packages/patches/tbb-other-arches.patch \
+ %D%/packages/patches/tcbrindle-span-include-exception.patch \
%D%/packages/patches/tclxml-3.2-install.patch \
%D%/packages/patches/tcsh-fix-autotest.patch \
%D%/packages/patches/tkremind-fix-fontchooser.patch \
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index a7a103d079..bc04e3bf5b 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -4849,6 +4849,7 @@ meta data function.")
(file-name (git-file-name name version))
(sha256
(base32 "1v3x1mj4if8jrr7cmrcbhv8n8ygla0liqb0dic6g6ji7px2pr6jf"))
+ (patches (search-patches "tcbrindle-span-include-exception.patch"))
(modules '((guix build utils)))
;; Unbundle catch.
(snippet
diff --git a/gnu/packages/patches/tcbrindle-span-include-exception.patch
b/gnu/packages/patches/tcbrindle-span-include-exception.patch
new file mode 100644
index 0000000000..3583c0d3ce
--- /dev/null
+++ b/gnu/packages/patches/tcbrindle-span-include-exception.patch
@@ -0,0 +1,21 @@
+The std::terminate function is declared in the <exception> header, so we need
+to include it in the non-exception case.
+
+Upstream-Status: https://github.com/tcbrindle/span/pull/53
+
+diff --git a/include/tcb/span.hpp b/include/tcb/span.hpp
+index 8efcddb..96aaef5 100644
+--- a/include/tcb/span.hpp
++++ b/include/tcb/span.hpp
+@@ -27,6 +27,8 @@
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2019/n4820.pdf
+ #ifndef TCB_SPAN_NO_EXCEPTIONS
+ #include <cstdio>
+ #include <stdexcept>
++#else
++#include <exception> // for std::terminate
+ #endif
+
+ // Various feature test macros
+--
+2.54.0
+
