summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authort-karatsu <49965247+t-karatsu@users.noreply.github.com>2019-09-03 23:27:48 +0900
committerAdam J. Stewart <ajstewart426@gmail.com>2019-09-03 09:27:48 -0500
commitae41ef914602b3d957f7567ee571b58a3ef32134 (patch)
tree1923e090c3f65eedcf39d2e5a0ff151bb073fe50 /var
parent9e1800d81c37d72d9ab0fd1283b9a55df60e1012 (diff)
downloadspack-ae41ef914602b3d957f7567ee571b58a3ef32134.tar.gz
spack-ae41ef914602b3d957f7567ee571b58a3ef32134.tar.bz2
spack-ae41ef914602b3d957f7567ee571b58a3ef32134.tar.xz
spack-ae41ef914602b3d957f7567ee571b58a3ef32134.zip
Boost/Change the method for analysis version (#12676)
* boost:Change the method for analysis version when using Fujitsu compiler. * Change version to apply patch for Fujitsu. * fix typo
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/boost/fujitsu_version_analysis.patch11
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py3
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis.patch b/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis.patch
new file mode 100644
index 0000000000..eedbc75704
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/fujitsu_version_analysis.patch
@@ -0,0 +1,11 @@
+--- boost_1_70_0/tools/build/src/tools/clang-linux.jam.back 2019-08-29 17:02:15.285225280 +0900
++++ boost_1_70_0/tools/build/src/tools/clang-linux.jam 2019-08-29 17:02:33.627143178 +0900
+@@ -52,7 +52,7 @@
+ if $(command) {
+ local command-string = \"$(command)\" ;
+ command-string = $(command-string:J=" ") ;
+- version ?= [ MATCH "version ([0-9.]+)"
++ version ?= [ MATCH "Compiler ([0-9.]+)"
+ : [ SHELL "$(command-string) --version" ] ] ;
+ }
+
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 86bd6eba54..583f550bc6 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -186,6 +186,9 @@ class Boost(Package):
patch('system-non-virtual-dtor-test.patch', when='@1.69.0',
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')
+
def url_for_version(self, version):
if version >= Version('1.63.0'):
url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2"