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

kaldi: Change process of version analysis when using Fujitsu compiler. (#13960)

Browse Source
This commit is contained in:
t-karatsu 2019-12-04 01:34:05 +09:00 committed by Adam J. Stewart
parent fb52f1c7e2
commit 111dc8f823
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/kaldi/fujitsu_fix_version_analysis.patch Normal file
View File

@ -0,0 +1,11 @@
--- spack-src/src/configure.org 2019-12-03 10:51:10.415048439 +0900
+++ spack-src/src/configure 2019-12-03 10:51:37.467877147 +0900
@@ -214,7 +214,7 @@
You need g++ >= 4.7, Apple clang >= 5.0 or LLVM clang >= 3.3."
fi
elif [[ $COMPILER_VER_INFO == *"LLVM"* ]]; then
- CLANG_VER=$(echo $COMPILER_VER_INFO | grep version | sed "s/.*version \([0-9\.]*\).*/\1/")
+ CLANG_VER=$(echo $COMPILER_VER_INFO | grep LLVM | sed "s/.*LLVM \([0-9\.]*\).*/\1/")
CLANG_VER_NUM=$(echo $CLANG_VER | sed 's/\./ /g' | xargs printf "%d%02d")
if [ $CLANG_VER_NUM -lt 303 ]; then
failure "$COMPILER (LLVM clang-$CLANG_VER) is not supported.

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

@ -42,6 +42,9 @@ class Kaldi(Package): # Does not use Autotools
patch('openfst-1.4.1.patch', when='@2015-10-07') patch('openfst-1.4.1.patch', when='@2015-10-07')
# Change process of version analysis when using Fujitsu compiler.
patch('fujitsu_fix_version_analysis.patch', when='@2018-07-11:%fj')
def install(self, spec, prefix): def install(self, spec, prefix):
configure_args = ['--fst-root=' + spec['openfst'].prefix] configure_args = ['--fst-root=' + spec['openfst'].prefix]
configure_args.append('--fst-version=' + str(spec['openfst'].version)) configure_args.append('--fst-version=' + str(spec['openfst'].version))