diff options
| author | Olivier Cessenat <cessenat@gmail.com> | 2021-03-02 09:47:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 09:47:00 +0100 |
| commit | 880bb06cbfea30d498b04aff919c7a93f253b9e9 (patch) | |
| tree | 9bfc8ece9965ea5859b16945c3264358be937515 | |
| parent | fac785914b4e202baf66dacf62c21721e3180b87 (diff) | |
| download | spack-880bb06cbfea30d498b04aff919c7a93f253b9e9.tar.gz spack-880bb06cbfea30d498b04aff919c7a93f253b9e9.tar.bz2 spack-880bb06cbfea30d498b04aff919c7a93f253b9e9.tar.xz spack-880bb06cbfea30d498b04aff919c7a93f253b9e9.zip | |
octave: provides fltk with opengl, adds qscintilla (#21903)
| -rw-r--r-- | var/spack/repos/builtin/packages/octave/package.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index 2f12c5c0de..7dcdeed439 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -88,12 +88,13 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): depends_on('gnuplot', when='+gnuplot') depends_on('imagemagick', when='+magick') depends_on('hdf5', when='+hdf5') - depends_on('java', when='+jdk') # TODO: requires Java 6 ? + depends_on('java', when='+jdk') # TODO: requires Java 6 ? depends_on('llvm', when='+llvm') - # depends_on('opengl', when='+opengl') # TODO: add package + depends_on('gl', when='+opengl') + depends_on('gl', when='+fltk') depends_on('qhull', when='+qhull') depends_on('qrupdate', when='+qrupdate') - # depends_on('qscintilla', when='+qscintilla) # TODO: add package + depends_on('qscintilla', when='+qscintilla') depends_on('qt+opengl', when='+qt') depends_on('suite-sparse', when='+suitesparse') depends_on('zlib', when='+zlib') @@ -239,7 +240,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage): else: config_args.append("--disable-java") - if '~opengl' in spec: + if '~opengl' and '~fltk' in spec: config_args.extend([ "--without-opengl", "--without-framework-opengl" |