From e8da94207a741318401995aef4fcaeb91cabfe1d Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 2 Jan 2025 16:37:36 +0100
Subject: [PATCH] gnu: tbb: Fix build with gcc-14.

* gnu/packages/patches/tbb-gcc-14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/tbb.scm (tbb)[source]: Use it.

Change-Id: Ia8a5a609af4b0f7273912f1f3de1bd2f44b2f160
---
 gnu/local.mk                          |  1 +
 gnu/packages/patches/tbb-gcc-14.patch | 13 +++++++++++++
 gnu/packages/tbb.scm                  |  4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/tbb-gcc-14.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ec3a04a8903..e567b4d3364 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2329,6 +2329,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/tao-fix-parser-types.patch		\
   %D%/packages/patches/tar-remove-wholesparse-check.patch	\
   %D%/packages/patches/tar-skip-unreliable-tests.patch		\
+  %D%/packages/patches/tbb-gcc-14.patch				\
   %D%/packages/patches/tbb-other-arches.patch			\
   %D%/packages/patches/tclxml-3.2-install.patch			\
   %D%/packages/patches/tcsh-fix-autotest.patch			\
diff --git a/gnu/packages/patches/tbb-gcc-14.patch b/gnu/packages/patches/tbb-gcc-14.patch
new file mode 100644
index 00000000000..06e9640c78a
--- /dev/null
+++ b/gnu/packages/patches/tbb-gcc-14.patch
@@ -0,0 +1,13 @@
+Upstream-status: Not presented upstream.
+
+--- tbb-2021.6.0-checkout/test/common/utils_assert.h	1970-01-01 01:00:01.000000000 +0100
++++ tbb-2021.6.0-checkout/test/common/utils_assert.h	2025-01-02 16:35:04.800740811 +0100
+@@ -20,6 +20,8 @@
+ #include "config.h"
+ #include "utils_report.h"
+ 
++#include <cstdlib>
++
+ #define REPORT_FATAL_ERROR REPORT
+ 
+ namespace utils {
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index da3ea74fb60..79a620c2a30 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,7 +46,8 @@
               (sha256
                (base32
                 "039v4jmnkkxs7haxrfmk9j57vfbrwlhjynlm5byfaqddv4cbsy0p"))
-              (patches (search-patches "tbb-other-arches.patch"))))
+              (patches (search-patches "tbb-other-arches.patch"
+                                       "tbb-gcc-14.patch"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags