zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Boost/Change the method for analysis version (#12676)

Browse Source 
* boost:Change the method for analysis version when using Fujitsu compiler.

* Change version to apply patch for Fujitsu.

* fix typo
This commit is contained in:
t-karatsu 2019-09-03 23:27:48 +09:00 committed by Adam J. Stewart
parent 9e1800d81c
commit ae41ef9146
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/boost/fujitsu_version_analysis.patch Normal file
View File

@ -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" ] ] ;
}

3
var/spack/repos/builtin/packages/boost/package.py
View File

@ -186,6 +186,9 @@ class Boost(Package):
patch('system-non-virtual-dtor-test.patch', when='@1.69.0', patch('system-non-virtual-dtor-test.patch', when='@1.69.0',
working_dir='libs/system', level=1) 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): def url_for_version(self, version):
if version >= Version('1.63.0'): if version >= Version('1.63.0'):
url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2" url = "https://dl.bintray.com/boostorg/release/{0}/source/boost_{1}.tar.bz2"