hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #985 from davydden/update/octave

Browse source 
octave: add missing dependencies and update to 4.0.2
This commit is contained in:
Todd Gamblin 2016-05-24 01:24:31 -05:00
commit 6fba102d7d
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
var/spack/repos/builtin/packages/octave/package.py
View file

@ -23,6 +23,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import sys
class Octave(Package): class Octave(Package):
"""GNU Octave is a high-level language, primarily intended for numerical """GNU Octave is a high-level language, primarily intended for numerical
@ -34,7 +36,8 @@ class Octave(Package):
homepage = "https://www.gnu.org/software/octave/" homepage = "https://www.gnu.org/software/octave/"
url = "ftp://ftp.gnu.org/gnu/octave/octave-4.0.0.tar.gz" url = "ftp://ftp.gnu.org/gnu/octave/octave-4.0.0.tar.gz"
version('4.0.0' , 'a69f8320a4f20a8480c1b278b1adb799') version('4.0.2', 'c2a5cacc6e4c52f924739cdf22c2c687')
version('4.0.0', 'a69f8320a4f20a8480c1b278b1adb799')
# Variants # Variants
variant('readline', default=True) variant('readline', default=True)
@ -62,7 +65,10 @@ class Octave(Package):
# Required dependencies # Required dependencies
depends_on('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
# Octave does not configure with sed from darwin:
depends_on('sed', sys.platform == 'darwin')
depends_on('pcre') depends_on('pcre')
depends_on('pkg-config')
# Strongly recommended dependencies # Strongly recommended dependencies
depends_on('readline', when='+readline') depends_on('readline', when='+readline')
@ -81,15 +87,14 @@ class Octave(Package):
depends_on('hdf5', when='+hdf5') depends_on('hdf5', when='+hdf5')
depends_on('jdk', when='+jdk') depends_on('jdk', when='+jdk')
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')
depends_on('qrupdate', when='+qrupdate') depends_on('qrupdate', when='+qrupdate')
#depends_on('qscintilla', when='+qscintilla) # TODO: add package # depends_on('qscintilla', when='+qscintilla) # TODO: add package
depends_on('qt', when='+qt') depends_on('qt', when='+qt')
depends_on('suite-sparse',when='+suitesparse') depends_on('suite-sparse', when='+suitesparse')
depends_on('zlib', when='+zlib') depends_on('zlib', when='+zlib')
def install(self, spec, prefix): def install(self, spec, prefix):
config_args = [ config_args = [
"--prefix=%s" % prefix "--prefix=%s" % prefix
@ -154,7 +159,8 @@ def install(self, spec, prefix):
config_args.append("--without-glpk") config_args.append("--without-glpk")
if '+magick' in spec: if '+magick' in spec:
config_args.append("--with-magick=%s" % spec['ImageMagick'].prefix.lib) config_args.append("--with-magick=%s"
% spec['ImageMagick'].prefix.lib)
if '+hdf5' in spec: if '+hdf5' in spec:
config_args.extend([ config_args.extend([
@ -187,7 +193,8 @@ def install(self, spec, prefix):
if '+qrupdate' in spec: if '+qrupdate' in spec:
config_args.extend([ config_args.extend([
"--with-qrupdate-includedir=%s" % spec['qrupdate'].prefix.include, "--with-qrupdate-includedir=%s"
% spec['qrupdate'].prefix.include,
"--with-qrupdate-libdir=%s" % spec['qrupdate'].prefix.lib "--with-qrupdate-libdir=%s" % spec['qrupdate'].prefix.lib
]) ])
else: else: