From b0c63a65541209442327490a8b6c8f84c274768c Mon Sep 17 00:00:00 2001 From: Toyohisa Kameyama Date: Fri, 4 Mar 2022 18:24:12 +0900 Subject: boost: update version analysis patch for fujitsu compiler. (#29198) --- .../packages/boost/fujitsu_version_analysis-1.77.patch | 11 +++++++++++ var/spack/repos/builtin/packages/boost/package.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/boost/fujitsu_version_analysis-1.77.patch diff --git a/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis-1.77.patch b/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis-1.77.patch new file mode 100644 index 0000000000..14b467f735 --- /dev/null +++ b/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis-1.77.patch @@ -0,0 +1,11 @@ +--- spack-src/tools/build/src/tools/clang-linux.jam.orig 2022-02-22 09:51:17.000000000 +0900 ++++ spack-src/tools/build/src/tools/clang-linux.jam 2022-02-22 11:22:58.000000000 +0900 +@@ -97,7 +97,7 @@ + + rule get-full-version ( command-string ) + { +- return [ common.match-command-output version : "version ([0-9.]+)" ++ return [ common.match-command-output version : "LLVM ([0-9.]+)" + : "$(command-string) --version" ] ; + } + diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 8c28c5669f..39d9b1d991 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -261,7 +261,8 @@ class Boost(Package): working_dir='libs/system', level=1) # Change the method for version analysis when using Fujitsu compiler. - patch('fujitsu_version_analysis.patch', when='@1.67.0:%fj') + patch('fujitsu_version_analysis.patch', when='@1.67.0:1.76.0%fj') + patch('fujitsu_version_analysis-1.77.patch', when='@1.77.0:%fj') # Add option to C/C++ compile commands in clang-linux.jam patch('clang-linux_add_option.patch', when='@1.56.0:1.63.0') -- cgit v1.2.3-60-g2f50