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

octave: fix missing --without statements (#3178)

Browse Source
This commit is contained in:
Denis Davydov 2017-02-18 23:13:00 +01:00 committed by Adam J. Stewart
parent 1a5b3e184f
commit 7f89bc1e1d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class Octave(AutotoolsPackage):
depends_on('gnuplot', when='+gnuplot') depends_on('gnuplot', when='+gnuplot')
depends_on('image-magick', when='+magick') depends_on('image-magick', when='+magick')
depends_on('hdf5', when='+hdf5') 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('llvm', when='+llvm')
# depends_on('opengl', when='+opengl') # TODO: add package # depends_on('opengl', when='+opengl') # TODO: add package
depends_on('qhull', when='+qhull') depends_on('qhull', when='+qhull')
@ -167,6 +167,8 @@ def configure_args(self):
if '+magick' in spec: if '+magick' in spec:
config_args.append("--with-magick=%s" config_args.append("--with-magick=%s"
% spec['image-magick'].prefix.lib) % spec['image-magick'].prefix.lib)
else:
config_args.append("--without-magick")
if '+hdf5' in spec: if '+hdf5' in spec:
config_args.extend([ config_args.extend([
@ -182,12 +184,15 @@ def configure_args(self):
"--with-java-includedir=%s" % spec['jdk'].prefix.include, "--with-java-includedir=%s" % spec['jdk'].prefix.include,
"--with-java-libdir=%s" % spec['jdk'].prefix.lib "--with-java-libdir=%s" % spec['jdk'].prefix.lib
]) ])
else:
config_args.append("--disable-java")
if '~opengl' in spec: if '~opengl' in spec:
config_args.extend([ config_args.extend([
"--without-opengl", "--without-opengl",
"--without-framework-opengl" "--without-framework-opengl"
]) ])
# TODO: opengl dependency and package is missing?
if '+qhull' in spec: if '+qhull' in spec:
config_args.extend([ config_args.extend([