summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingbei Li2017-04-25 13:24:22 +0800
committerJingbei Li2017-04-25 13:24:22 +0800
commitba43803ffa6f8c9e749ca885c7eaa605442d8181 (patch)
tree063ffd72c2d267f8567705a6b3a0f9c8b494ab17
parentd64e96bc8bd121d427dd0819247f288a0dbd7456 (diff)
downloadaur-ba43803ffa6f8c9e749ca885c7eaa605442d8181.tar.gz
fix openfst path
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--env.sh7
3 files changed, 8 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea4b855dcb17..a794cb548ab0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Apr 19 13:40:14 UTC 2017
+# Tue Apr 25 05:01:34 UTC 2017
pkgbase = kaldi
pkgdesc = Speech recognition research toolkit
- pkgver = 5.1.r7302.81346fc4b
+ pkgver = 5.1.r7311.1f51ef5d0
pkgrel = 1
url = https://github.com/kaldi-asr/kaldi
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 775452d1e2c8..5f9ecd215b32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jingbei Li <i@jingbei.lli>
pkgname='kaldi'
pkgdesc='Speech recognition research toolkit'
-pkgver=5.1.r7302.81346fc4b
+pkgver=5.1.r7311.1f51ef5d0
pkgrel=1
makedepends=('gcc5' 'git' 'wget' 'subversion')
depends=('python2' 'openblas-lapack')
@@ -41,18 +41,12 @@ prepare(){
build () {
cd $srcdir/$pkgname/tools
- sed -e '/^sclite_compiled/s/ sctk_configured//' \
- -e 's?^\(\tcd openfst-[^\s]* \./configure --prefix\)=`pwd`?\1=/opt/'$pkgname'/tools/openfst-$(OPENFST_VERSION)?' \
- -e 's?^\(\t\$(MAKE) -C openfst-[^\s]*\) \(install\)?\1 DESTDIR='$srcdir/$pkgname' \2?' \
+ sed \
+ -e '/^sclite_compiled/s/ sctk_configured//' \
-i Makefile
sed 's/^exit/# exit/' -i extras/check_dependencies.sh
make CXX=g++-5 sph2pipe openfst sctk_configured
- OPENFST=../opt/$pkgname/tools/openfst-*
- mv openfst-*/Makefile $OPENFST/
- rm -r openfst-*/
- mv $OPENFST ./
-
sed '/^DEFS/s/ -Dsize_t=unsigned//' -i sctk/src/sclite/makefile
make sclite
@@ -89,6 +83,9 @@ package () {
sed -i "s|$srcdir|/opt|g" $i
done
+ echo "export OPENFST=$(find tools -type d -name 'openfst*')" >> tools/env.sh
+ echo 'export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${OPENFST}/lib' >> tools/env.sh
+
mkdir -p $pkgdir/opt/$pkgname
cp -rL src $pkgdir/opt/$pkgname
cp -r misc egs tools $pkgdir/opt/$pkgname
diff --git a/env.sh b/env.sh
deleted file mode 100644
index 9d553cea793e..000000000000
--- a/env.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-export IRSTLM=/opt/kaldi/tools/irstlm
-export PATH=${PATH}:${IRSTLM}/bin
-export PATH=${PATH}:/opt/kaldi/tools/kaldi_lm
-export LIBLBFGS=/opt/kaldi/tools/liblbfgs-1.10
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${LIBLBFGS}/lib/.libs
-export SRILM=/opt/kaldi/tools/srilm
-export PATH=${PATH}:${SRILM}/bin:${SRILM}/bin/i686-m64