From ccae0ad534bde980525cc6bd6c5513932f1b078a Mon Sep 17 00:00:00 2001
From: Robert Cohn <robert.s.cohn@intel.com>
Date: Wed, 28 Jun 2023 14:08:12 -0400
Subject: [intel-tbb] support for building 2020.3 with icx (for dyninst)
 (#38610)

---
 .../packages/intel-tbb/intel-tbb.2020.3-icx.patch   | 21 +++++++++++++++++++++
 .../repos/builtin/packages/intel-tbb/package.py     |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/intel-tbb/intel-tbb.2020.3-icx.patch

diff --git a/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.2020.3-icx.patch b/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.2020.3-icx.patch
new file mode 100644
index 0000000000..58bc645df0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/intel-tbb/intel-tbb.2020.3-icx.patch
@@ -0,0 +1,21 @@
+diff --git a/build/linux.gcc.inc b/build/linux.gcc.inc
+index d820c15d..a20d52ba 100644
+--- a/build/linux.gcc.inc
++++ b/build/linux.gcc.inc
+@@ -54,14 +54,14 @@ endif
+ ifneq (,$(shell $(CONLY) -dumpfullversion -dumpversion | egrep  "^([5-9]|1[0-9])"))
+     # enable -Wsuggest-override via a pre-included header in order to limit to C++11 and above
+     INCLUDE_TEST_HEADERS = -include $(tbb_root)/src/test/harness_preload.h
+-    WARNING_SUPPRESS += -Wno-sized-deallocation
++    #WARNING_SUPPRESS += -Wno-sized-deallocation
+ endif
+ 
+ # gcc 6.0 and later have -flifetime-dse option that controls
+ # elimination of stores done outside the object lifetime
+ ifneq (,$(shell $(CONLY) -dumpfullversion -dumpversion | egrep  "^([6-9]|1[0-9])"))
+     # keep pre-contruction stores for zero initialization
+-    DSE_KEY = -flifetime-dse=1
++    #DSE_KEY = -flifetime-dse=1
+ endif
+ 
+ ifeq ($(cfg), release)
diff --git a/var/spack/repos/builtin/packages/intel-tbb/package.py b/var/spack/repos/builtin/packages/intel-tbb/package.py
index e6f9598c1e..b8e4d92d3d 100644
--- a/var/spack/repos/builtin/packages/intel-tbb/package.py
+++ b/var/spack/repos/builtin/packages/intel-tbb/package.py
@@ -144,6 +144,9 @@ class IntelTbb(CMakePackage, MakefilePackage):
     # https://github.com/oneapi-src/oneTBB/commit/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch?full_index=1
     patch("macos-arm64.patch", when="@:2021.0")
 
+    # build older tbb with %oneapi
+    patch("intel-tbb.2020.3-icx.patch", when="@2020.3 %oneapi")
+
     # Support for building with %nvhpc
     # 1) remove flags nvhpc compilers do not recognize
     patch("intel-tbb.nvhpc-remove-flags.2017.patch", when="@2017:2018.9 %nvhpc")
-- 
cgit v1.2.3-60-g2f50