From 4365ed9205db7811125b1abdd4816054210040a7 Mon Sep 17 00:00:00 2001 From: archxlith <55454330+archxlith@users.noreply.github.com> Date: Fri, 28 May 2021 10:46:00 -0400 Subject: [PATCH] openfst: add v1.8.1, add "python" variant (#23850) --- .../repos/builtin/packages/openfst/package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/var/spack/repos/builtin/packages/openfst/package.py b/var/spack/repos/builtin/packages/openfst/package.py index eed28c0962..8a862c953f 100644 --- a/var/spack/repos/builtin/packages/openfst/package.py +++ b/var/spack/repos/builtin/packages/openfst/package.py @@ -16,6 +16,7 @@ class Openfst(AutotoolsPackage): url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-1.6.1.tar.gz" list_url = "http://www.openfst.org/twiki/bin/view/FST/FstDownload" + version('1.8.1', sha256='24fb53b72bb687e3fa8ee96c72a31ff2920d99b980a0a8f61dda426fca6713f0') version('1.7.9', sha256='9319aeb31d1e2950ae25449884e255cc2bc9dfaf987f601590763e61a10fbdde') version('1.6.7', sha256='e21a486d827cde6a592c8e91721e4540ad01a5ae35a60423cf17be4d716017f7') version('1.6.1', sha256='5245af8ebccb96208eec2dfe3b3a81143d3565a4d41220bff299287fb3333f7d') @@ -34,6 +35,11 @@ class Openfst(AutotoolsPackage): conflicts('%gcc@6:', when='@:1.6.1') variant('far', default=False, description="Enable FAR support") + variant('python', default=False, description="Enable python extension") + + depends_on('python@3.6:', when='+python') + + extends('python', when='+python') # Patch openfst-1.4.1 for kaldi@c024e8 # See https://github.com/kaldi-asr/kaldi/blob/c024e8aa0a727bf76c91a318f76a1f8b0b59249e/tools/Makefile#L82-L88 @@ -41,10 +47,4 @@ class Openfst(AutotoolsPackage): patch('openfst_gcc41up.patch', when='@1.4.1-patch') def configure_args(self): - args = [] - spec = self.spec - if '+far' in spec: - args.append('--enable-far') - else: - args.append('--disable-far') - return args + return self.enable_or_disable('far') + self.enable_or_disable('python')