diff options
| author | Olivier Cessenat <cessenat@gmail.com> | 2021-11-09 19:36:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-09 19:36:42 +0100 |
| commit | 31c932eec977f617ae86996b1513f6b26cf83cea (patch) | |
| tree | 48b7ff9226dbff2330f2fb610e5e39af2979f7fc /var | |
| parent | 86c8c3306bbf02c8b0556c00986c4fdda44b3711 (diff) | |
| download | spack-31c932eec977f617ae86996b1513f6b26cf83cea.tar.gz spack-31c932eec977f617ae86996b1513f6b26cf83cea.tar.bz2 spack-31c932eec977f617ae86996b1513f6b26cf83cea.tar.xz spack-31c932eec977f617ae86996b1513f6b26cf83cea.zip | |
octave: override qtchooser, add bz2 variant (#26802)
* octave: override qtchooser, add bz2 variant
* fix texinfo not found from "spack install --test=root -v"
Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/octave/package.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 172ec2af79..5b3885eedf 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -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 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): 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 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): 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 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): 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 # ======================================================================== |