From 96f9a1d88b2c25a37f97dcf96e596a7706cc4a2d Mon Sep 17 00:00:00 2001
From: eugeneswalker <38933153+eugeneswalker@users.noreply.github.com>
Date: Tue, 3 May 2022 22:29:37 -0700
Subject: boost: fix v1.78 build with oneapi (#30463)

---
 .../repos/builtin/packages/boost/1.78-intel-linux-jam.patch   | 11 +++++++++++
 var/spack/repos/builtin/packages/boost/package.py             |  7 +++++++
 2 files changed, 18 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/boost/1.78-intel-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
new file mode 100644
index 0000000000..d9fd0d7a4d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/1.78-intel-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 edeafe0648..bce3ce038b 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -344,6 +344,9 @@ class Boost(Package):
     # See https://github.com/spack/spack/issues/28273
     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")
+
     def patch(self):
         # Disable SSSE3 and AVX2 when using the NVIDIA compiler
         if self.spec.satisfies('%nvhpc'):
@@ -357,6 +360,10 @@ class Boost(Package):
             filter_file('-fast', '-O1', 'tools/build/src/tools/pgi.jam')
             filter_file('-fast', '-O1', 'tools/build/src/engine/build.sh')
 
+        # Fixes https://github.com/spack/spack/issues/29352
+        if self.spec.satisfies('@1.78 %intel') or self.spec.satisfies('@1.78 %oneapi'):
+            filter_file('-static', '', 'tools/build/src/engine/build.sh')
+
     def url_for_version(self, version):
         if version >= Version('1.63.0'):
             url = "https://boostorg.jfrog.io/artifactory/main/release/{0}/source/boost_{1}.tar.bz2"
-- 
cgit v1.2.3-70-g09d2