From 111dc8f823104bb6cf14675fb8d6387e1b8610b0 Mon Sep 17 00:00:00 2001
From: t-karatsu <49965247+t-karatsu@users.noreply.github.com>
Date: Wed, 4 Dec 2019 01:34:05 +0900
Subject: kaldi: Change process of version analysis when using Fujitsu
 compiler. (#13960)

---
 .../builtin/packages/kaldi/fujitsu_fix_version_analysis.patch | 11 +++++++++++
 var/spack/repos/builtin/packages/kaldi/package.py             |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/kaldi/fujitsu_fix_version_analysis.patch

(limited to 'var')

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))
-- 
cgit v1.2.3-70-g09d2