diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-02-18 23:13:00 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-02-18 16:13:00 -0600 |
| commit | 7f89bc1e1d82fa4b452f0573cc7c8f382a604a05 (patch) | |
| tree | e65e7af9c147f72fc4ddbb2d19688a995ff2addf | |
| parent | 1a5b3e184fa2eafc563e52db21a311969614d4a4 (diff) | |
| download | spack-7f89bc1e1d82fa4b452f0573cc7c8f382a604a05.tar.gz spack-7f89bc1e1d82fa4b452f0573cc7c8f382a604a05.tar.bz2 spack-7f89bc1e1d82fa4b452f0573cc7c8f382a604a05.tar.xz spack-7f89bc1e1d82fa4b452f0573cc7c8f382a604a05.zip | |
octave: fix missing --without statements (#3178)
| -rw-r--r-- | var/spack/repos/builtin/packages/octave/package.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py index ed8d28ebda..731e2a630f 100644 --- a/var/spack/repos/builtin/packages/octave/package.py +++ b/var/spack/repos/builtin/packages/octave/package.py @@ -88,7 +88,7 @@ class Octave(AutotoolsPackage): depends_on('gnuplot', when='+gnuplot') depends_on('image-magick', when='+magick') depends_on('hdf5', when='+hdf5') - depends_on('jdk', when='+jdk') + depends_on('jdk', when='+jdk') # TODO: requires Java 6 ? depends_on('llvm', when='+llvm') # depends_on('opengl', when='+opengl') # TODO: add package depends_on('qhull', when='+qhull') @@ -167,6 +167,8 @@ class Octave(AutotoolsPackage): if '+magick' in spec: config_args.append("--with-magick=%s" % spec['image-magick'].prefix.lib) + else: + config_args.append("--without-magick") if '+hdf5' in spec: config_args.extend([ @@ -182,12 +184,15 @@ class Octave(AutotoolsPackage): "--with-java-includedir=%s" % spec['jdk'].prefix.include, "--with-java-libdir=%s" % spec['jdk'].prefix.lib ]) + else: + config_args.append("--disable-java") if '~opengl' in spec: config_args.extend([ "--without-opengl", "--without-framework-opengl" ]) + # TODO: opengl dependency and package is missing? if '+qhull' in spec: config_args.extend([ |