From e0a03d07de078b5214df8760b24e26b5f9e52e55 Mon Sep 17 00:00:00 2001
From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com>
Date: Fri, 12 Aug 2022 20:02:00 -0700
Subject: boost@1.76:1.79 %oneapi: patch according to Intel guide for building
 Boost (#32097)

---
 .../repos/builtin/packages/boost/1.78-intel-linux-jam.patch   | 11 -----------
 .../repos/builtin/packages/boost/intel-oneapi-linux-jam.patch | 11 +++++++++++
 var/spack/repos/builtin/packages/boost/package.py             |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 var/spack/repos/builtin/packages/boost/1.78-intel-linux-jam.patch
 create mode 100644 var/spack/repos/builtin/packages/boost/intel-oneapi-linux-jam.patch

diff --git a/var/spack/repos/builtin/packages/boost/1.78-intel-linux-jam.patch b/var/spack/repos/builtin/packages/boost/1.78-intel-linux-jam.patch
deleted file mode 100644
index d9fd0d7a4d..0000000000
--- a/var/spack/repos/builtin/packages/boost/1.78-intel-linux-jam.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/build/src/tools/intel-linux.jam	2021-12-01 22:47:38.000000000 -0800
-+++ b/tools/build/src/tools/intel-linux.jam	2022-05-03 13:40:41.569430070 -0700
-@@ -276,7 +276,7 @@
- #
- actions compile.c++.pch
- {
--    rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
-+    rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -Xclang -emit-pch -o "$(<)" "$(>)"
- }
- 
- actions compile.fortran
diff --git a/var/spack/repos/builtin/packages/boost/intel-oneapi-linux-jam.patch b/var/spack/repos/builtin/packages/boost/intel-oneapi-linux-jam.patch
new file mode 100644
index 0000000000..d9fd0d7a4d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/intel-oneapi-linux-jam.patch
@@ -0,0 +1,11 @@
+--- a/tools/build/src/tools/intel-linux.jam	2021-12-01 22:47:38.000000000 -0800
++++ b/tools/build/src/tools/intel-linux.jam	2022-05-03 13:40:41.569430070 -0700
+@@ -276,7 +276,7 @@
+ #
+ actions compile.c++.pch
+ {
+-    rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
++    rm -f "$(<)" && LD_LIBRARY_PATH="$(RUN_PATH)" "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -Xclang -emit-pch -o "$(<)" "$(>)"
+ }
+ 
+ actions compile.fortran
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 32c57bcd3b..4e2c05ada3 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -380,7 +380,7 @@ class Boost(Package):
     patch("pthread-stack-min-fix.patch", when="@1.69.0:1.72.0")
 
     # https://www.intel.com/content/www/us/en/developer/articles/technical/building-boost-with-oneapi.html
-    patch("1.78-intel-linux-jam.patch", when="@1.78 %oneapi")
+    patch("intel-oneapi-linux-jam.patch", when="@1.76:1.79 %oneapi")
 
     def patch(self):
         # Disable SSSE3 and AVX2 when using the NVIDIA compiler
-- 
cgit v1.2.3-60-g2f50