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

octave: override qtchooser, add bz2 variant (#26802)

Browse Source 
* octave: override qtchooser, add bz2 variant

* fix texinfo not found from "spack install --test=root -v"

Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
This commit is contained in:
Olivier Cessenat 2021-11-09 19:36:42 +01:00 committed by GitHub
parent 86c8c3306b
commit 31c932eec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/octave/package.py
View File

@ -46,6 +46,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
# Variants
variant('readline', default=True)
variant('bz2', default=True)
variant('arpack', default=False)
variant('curl', default=False)
variant('fftw', default=False)
@ -74,9 +75,11 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
depends_on('sed', when=sys.platform == 'darwin', type='build')
depends_on('pcre')
depends_on('pkgconfig', type='build')
depends_on('texinfo', type='build')
# Strongly recommended dependencies
depends_on('readline', when='+readline')
depends_on('bzip2', when='+bz2')
# Optional dependencies
depends_on('arpack-ng', when='+arpack')
@ -181,6 +184,14 @@ def configure_args(self):
else:
config_args.append('--disable-readline')
if '+bz2' in spec:
config_args.extend([
"--with-bz2-includedir=%s" % spec['bzip2'].prefix.include,
"--with-bz2-libdir=%s" % spec['bzip2'].prefix.lib
])
else:
config_args.append("--without-bz2")
# Optional dependencies
if '+arpack' in spec:
sa = spec['arpack-ng']
@ -275,6 +286,8 @@ def configure_args(self):
else:
config_args.append("--without-qrupdate")
config_args += self.with_or_without("qscintilla")
if '+zlib' in spec:
config_args.extend([
"--with-z-includedir=%s" % spec['zlib'].prefix.include,
@ -293,6 +306,9 @@ def configure_args(self):
if spec.satisfies('%fj'):
config_args.append('--enable-fortran-calling-convention=gfortran')
# Make sure we do not use qtchooser
config_args.append('ac_cv_prog_ac_ct_QTCHOOSER=')
return config_args
# ========================================================================