diff options
| author | t-karatsu <49965247+t-karatsu@users.noreply.github.com> | 2019-12-04 01:34:05 +0900 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-12-03 10:34:05 -0600 |
| commit | 111dc8f823104bb6cf14675fb8d6387e1b8610b0 (patch) | |
| tree | 80b28efc40c3c8ac22a5ee1315591633e313aa4e | |
| parent | fb52f1c7e2079eb09260b6dc8b4cf548e4481c04 (diff) | |
| download | spack-111dc8f823104bb6cf14675fb8d6387e1b8610b0.tar.gz spack-111dc8f823104bb6cf14675fb8d6387e1b8610b0.tar.bz2 spack-111dc8f823104bb6cf14675fb8d6387e1b8610b0.tar.xz spack-111dc8f823104bb6cf14675fb8d6387e1b8610b0.zip | |
kaldi: Change process of version analysis when using Fujitsu compiler. (#13960)
| -rw-r--r-- | var/spack/repos/builtin/packages/kaldi/fujitsu_fix_version_analysis.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/kaldi/package.py | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/kaldi/fujitsu_fix_version_analysis.patch b/var/spack/repos/builtin/packages/kaldi/fujitsu_fix_version_analysis.patch new file mode 100644 index 0000000000..051e7a77a3 --- /dev/null +++ b/var/spack/repos/builtin/packages/kaldi/fujitsu_fix_version_analysis.patch @@ -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. diff --git a/var/spack/repos/builtin/packages/kaldi/package.py b/var/spack/repos/builtin/packages/kaldi/package.py index 8455763add..cde06bd7b5 100644 --- a/var/spack/repos/builtin/packages/kaldi/package.py +++ b/var/spack/repos/builtin/packages/kaldi/package.py @@ -42,6 +42,9 @@ class Kaldi(Package): # Does not use Autotools 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): configure_args = ['--fst-root=' + spec['openfst'].prefix] configure_args.append('--fst-version=' + str(spec['openfst'].version)) |