From 1527853efde5ceecd61ff97f4b883132ed72cc70 Mon Sep 17 00:00:00 2001 From: Martin Aumüller Date: Sat, 21 Oct 2023 15:26:36 +0200 Subject: intel-tbb: patch patch for Apple's patch (#40640) While e.g. GNU patch 2.7.6 (as provided by homebrew) would apply the previous version of this patch without problems, Apple's patch 2.0-12u11-Apple fails to find out which file to patch. Adding two lines to the patch fixes that. Renamed the patch in order to not require a `spack clean -m`. --- .../packages/intel-tbb/gcc_13-2021-v2.patch | 29 ++++++++++++++++++++++ .../builtin/packages/intel-tbb/gcc_13-2021.patch | 27 -------------------- .../repos/builtin/packages/intel-tbb/package.py | 2 +- 3 files changed, 30 insertions(+), 28 deletions(-) create mode 100644 var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021-v2.patch delete mode 100644 var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021-v2.patch b/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021-v2.patch new file mode 100644 index 0000000000..d1e87cd7c4 --- /dev/null +++ b/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021-v2.patch @@ -0,0 +1,29 @@ +From b66c3b217f1954e31ea6f40a2416dd3264861c66 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Tue, 21 Feb 2023 09:36:33 +0000 +Subject: [PATCH] test: common: include for abort() (fix build with + GCC 13) + +GCC 13 (as usual for new compiler releases) shuffles around some +internal includes and so etc is no longer transitively included. + +See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. + +Signed-off-by: Sam James +--- + test/common/utils_assert.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h +index 1df8ae72acc49fe38dac4d9bed4e9f4f26affcf5..0123ab881e124a800a5ebf8507050148038747d5 100644 +--- a/test/common/utils_assert.h ++++ b/test/common/utils_assert.h +@@ -20,6 +20,8 @@ + #include "config.h" + #include "utils_report.h" + ++#include ++ + #define REPORT_FATAL_ERROR REPORT + + namespace utils { diff --git a/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021.patch b/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021.patch deleted file mode 100644 index e1e1b1116b..0000000000 --- a/var/spack/repos/builtin/packages/intel-tbb/gcc_13-2021.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b66c3b217f1954e31ea6f40a2416dd3264861c66 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 21 Feb 2023 09:36:33 +0000 -Subject: [PATCH] test: common: include for abort() (fix build with - GCC 13) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so etc is no longer transitively included. - -See https://www.gnu.org/software/gcc/gcc-13/porting_to.html. - -Signed-off-by: Sam James ---- - test/common/utils_assert.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h -index 1df8ae72acc49fe38dac4d9bed4e9f4f26affcf5..0123ab881e124a800a5ebf8507050148038747d5 100644 -@@ -20,6 +20,8 @@ - #include "config.h" - #include "utils_report.h" - -+#include -+ - #define REPORT_FATAL_ERROR REPORT - - namespace utils { diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py index 45761c7a06..14da30b2d4 100644 --- a/var/spack/repos/builtin/packages/intel-tbb/package.py +++ b/var/spack/repos/builtin/packages/intel-tbb/package.py @@ -125,7 +125,7 @@ class IntelTbb(CMakePackage, MakefilePackage): patch("gcc_generic-pedantic-4.4.patch", level=1, when="@:2019.0") # Patch and conflicts for GCC 13 support (#1031). - patch("gcc_13-2021.patch", when="@2021.1:") + patch("gcc_13-2021-v2.patch", when="@2021.1:") conflicts("%gcc@13", when="@:2021.3") # Patch cmakeConfig.cmake.in to find the libraries where we install them. -- cgit v1.2.3-60-g2f50