Merge branch 'develop' of https://github.com/LLNL/spack into features/env_objects_flying_around

10 files changed, 360 insertions, 5 deletions

diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py
new file mode 100644
index 0000000000..f69f16d2cc
--- /dev/null
+++ b/var/spack/repos/builtin.mock/packages/hypre/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+class Hypre(Package):
+    """Hypre is included here as an example of a package that depends on
+       both LAPACK and BLAS."""
+    homepage = "http://www.openblas.net"
+    url      = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
+
+    version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9')
+
+    depends_on('lapack')
+    depends_on('blas')
+
+    def install(self, spec, prefix):
+        pass
diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py
new file mode 100644
index 0000000000..509bfb71e5
--- /dev/null
+++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py
@@ -0,0 +1,38 @@
+##############################################################################
+# Copyright (c) 2013-2015, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+class OpenblasWithLapack(Package):
+    """Dummy version of OpenBLAS that also provides LAPACK, for testing."""
+    homepage = "http://www.openblas.net"
+    url      = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
+
+    version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9')
+
+    provides('lapack')
+    provides('blas')
+
+    def install(self, spec, prefix):
+        pass
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py
index e20c1e4aeb..cc93c7067c 100644
--- a/var/spack/repos/builtin/packages/cmake/package.py
+++ b/var/spack/repos/builtin/packages/cmake/package.py
@@ -30,6 +30,7 @@ class Cmake(Package):
     homepage  = 'https://www.cmake.org'
     url       = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz'
 
+    version('3.5.0',    '33c5d09d4c33d4ffcc63578a6ba8777e')
     version('3.4.3',    '4cb3ff35b2472aae70f542116d616e63')
     version('3.4.0',    'cd3034e0a44256a0917e254167217fc8')
     version('3.3.1',    '52638576f4e1e621fed6c3410d3a1b12')
@@ -37,16 +38,48 @@ class Cmake(Package):
     version('2.8.10.2', '097278785da7182ec0aea8769d06860c')
 
     variant('ncurses', default=True, description='Enables the build of the ncurses gui')
+    variant('qt', default=False, description='Enables the build of cmake-gui')
+    variant('doc', default=False, description='Enables the generation of html and man page documentation')
+
     depends_on('ncurses', when='+ncurses')
+    depends_on('qt', when='+qt')
+    depends_on('python@2.7.11:', when='+doc')
+    depends_on('py-sphinx', when='+doc')
 
     def url_for_version(self, version):
         """Handle CMake's version-based custom URLs."""
         return 'https://cmake.org/files/v%s/cmake-%s.tar.gz' % (version.up_to(2), version)
 
+    def validate(self, spec):
+        """
+        Checks if incompatible versions of qt were specified
+
+        :param spec: spec of the package
+        :raises RuntimeError: in case of inconsistencies
+        """
+
+        if '+qt' in spec and spec.satisfies('^qt@5.4.0'):
+            msg = 'qt-5.4.0 has broken CMake modules.'
+            raise RuntimeError(msg)
 
     def install(self, spec, prefix):
-        configure('--prefix='   + prefix,
-                  '--parallel=' + str(make_jobs),
-                  '--', '-DCMAKE_USE_OPENSSL=ON')
+        # Consistency check
+        self.validate(spec)
+
+        # configure, build, install:
+        options = ['--prefix=%s' % prefix]
+        options.append('--parallel=%s' % str(make_jobs))
+
+        if '+qt' in spec:
+            options.append('--qt-gui')
+
+        if '+doc' in spec:
+            options.append('--sphinx-html')
+            options.append('--sphinx-man')
+
+        options.append('--')
+        options.append('-DCMAKE_USE_OPENSSL=ON')
+
+        configure(*options)
         make()
         make('install')
diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py
new file mode 100644
index 0000000000..caa264857e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/emacs/package.py
@@ -0,0 +1,21 @@
+from spack import *
+
+class Emacs(Package):
+    """The Emacs programmable text editor."""
+    homepage = "https://www.gnu.org/software/emacs"
+    url      = "http://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.gz"
+
+    version('24.5', 'd74b597503a68105e61b5b9f6d065b44')
+
+    depends_on('ncurses')
+    # Emacs also depends on:
+    #     GTK or other widget library
+    #     libtiff, png, etc.
+    # For now, we assume the system provides all that stuff.
+    # For Ubuntu 14.04 LTS:
+    #     sudo apt-get install libgtk-3-dev libxpm-dev libtiff5-dev libjpeg8-dev libgif-dev libpng12-dev
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/gl2ps/package.py b/var/spack/repos/builtin/packages/gl2ps/package.py
new file mode 100644
index 0000000000..cb376b3f03
--- /dev/null
+++ b/var/spack/repos/builtin/packages/gl2ps/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Gl2ps(Package):
+    """GL2PS is a C library providing high quality vector output for any
+    OpenGL application."""
+
+    homepage = "http://www.geuz.org/gl2ps/"
+    url      = "http://geuz.org/gl2ps/src/gl2ps-1.3.9.tgz"
+
+    version('1.3.9', '377b2bcad62d528e7096e76358f41140')
+
+    depends_on("libpng")
+
+    def install(self, spec, prefix):
+        cmake('.', *std_cmake_args)
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py
index fb6b99e27c..741f4af421 100644
--- a/var/spack/repos/builtin/packages/netlib-lapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py
@@ -12,6 +12,7 @@ class NetlibLapack(Package):
     homepage = "http://www.netlib.org/lapack/"
     url      = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
 
+    version('3.6.0', 'f2f6c67134e851fe189bb3ca1fbb5101')
     version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf')
     version('3.4.2', '61bf1a8a4469d4bdb7604f5897179478')
     version('3.4.1', '44c3869c38c8335c2b9c2a8bb276eb55')
diff --git a/var/spack/repos/builtin/packages/octave/package.py b/var/spack/repos/builtin/packages/octave/package.py
new file mode 100644
index 0000000000..38b355159d
--- /dev/null
+++ b/var/spack/repos/builtin/packages/octave/package.py
@@ -0,0 +1,183 @@
+from spack import *
+
+class Octave(Package):
+    """GNU Octave is a high-level language, primarily intended for numerical
+    computations. It provides a convenient command line interface for solving
+    linear and nonlinear problems numerically, and for performing other
+    numerical experiments using a language that is mostly compatible with
+    Matlab. It may also be used as a batch-oriented language."""
+
+    homepage = "https://www.gnu.org/software/octave/"
+    url      = "ftp://ftp.gnu.org/gnu/octave/octave-4.0.0.tar.gz"
+
+    version('4.0.0' , 'a69f8320a4f20a8480c1b278b1adb799')
+
+    # Variants
+    variant('readline',   default=True)
+    variant('arpack',     default=False)
+    variant('curl',       default=False)
+    variant('fftw',       default=False)
+    variant('fltk',       default=False)
+    variant('fontconfig', default=False)
+    variant('freetype',   default=False)
+    variant('glpk',       default=False)
+    variant('gl2ps',      default=False)
+    variant('gnuplot',    default=False)
+    variant('magick',     default=False)
+    variant('hdf5',       default=False)
+    variant('jdk',        default=False)
+    variant('llvm',       default=False)
+    variant('opengl',     default=False)
+    variant('qhull',      default=False)
+    variant('qrupdate',   default=False)
+    variant('qscintilla', default=False)
+    variant('qt',         default=False)
+    variant('suiteparse', default=False)
+    variant('zlib',       default=False)
+
+    # Required dependencies
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('pcre')
+
+    # Strongly recommended dependencies
+    depends_on('readline',    when='+readline')
+
+    # Optional dependencies
+    depends_on('arpack',      when='+arpack')
+    depends_on('curl',        when='+curl')
+    depends_on('fftw',      when='+fftw')
+    depends_on('fltk',        when='+fltk')
+    depends_on('fontconfig',  when='+fontconfig')
+    depends_on('freetype',    when='+freetype')
+    depends_on('glpk',        when='+glpk')
+    depends_on('gl2ps',       when='+gl2ps')
+    depends_on('gnuplot',     when='+gnuplot')
+    depends_on('ImageMagick', when='+magick')
+    depends_on('hdf5',        when='+hdf5')
+    depends_on('jdk',         when='+jdk')
+    depends_on('llvm',        when='+llvm')
+    #depends_on('opengl',      when='+opengl')    # TODO: add package
+    depends_on('qhull',       when='+qhull')
+    depends_on('qrupdate',    when='+qrupdate')
+    #depends_on('qscintilla',  when='+qscintilla) # TODO: add package
+    depends_on('qt',          when='+qt')
+    depends_on('SuiteSparse', when='+suitesparse')
+    depends_on('zlib',        when='+zlib')
+
+
+    def install(self, spec, prefix):
+        config_args = [
+            "--prefix=%s" % prefix
+        ]
+
+        # Required dependencies
+        config_args.extend([
+            "--with-blas=%s"   % spec['blas'].prefix.lib,
+            "--with-lapack=%s" % spec['lapack'].prefix.lib
+        ])
+
+        # Strongly recommended dependencies
+        if '+readline' in spec:
+            config_args.append('--enable-readline')
+        else:
+            config_args.append('--disable-readline')
+
+        # Optional dependencies
+        if '+arpack' in spec:
+            config_args.extend([
+                "--with-arpack-includedir=%s" % spec['arpack'].prefix.include,
+                "--with-arpack-libdir=%s"     % spec['arpack'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-arpack")
+
+        if '+curl' in spec:
+            config_args.extend([
+                "--with-curl-includedir=%s" % spec['curl'].prefix.include,
+                "--with-curl-libdir=%s"     % spec['curl'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-curl")
+
+        if '+fftw' in spec:
+            config_args.extend([
+                "--with-fftw3-includedir=%s"  % spec['fftw'].prefix.include,
+                "--with-fftw3-libdir=%s"      % spec['fftw'].prefix.lib,
+                "--with-fftw3f-includedir=%s" % spec['fftw'].prefix.include,
+                "--with-fftw3f-libdir=%s"     % spec['fftw'].prefix.lib
+            ])
+        else:
+            config_args.extend([
+                "--without-fftw3",
+                "--without-fftw3f"
+            ])
+
+        if '+fltk' in spec:
+            config_args.extend([
+                "--with-fltk-prefix=%s"      % spec['fltk'].prefix,
+                "--with-fltk-exec-prefix=%s" % spec['fltk'].prefix
+            ])
+        else:
+            config_args.append("--without-fltk")
+
+        if '+glpk' in spec:
+            config_args.extend([
+                "--with-glpk-includedir=%s" % spec['glpk'].prefix.include,
+                "--with-glpk-libdir=%s"     % spec['glpk'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-glpk")
+
+        if '+magick' in spec:
+            config_args.append("--with-magick=%s" % spec['ImageMagick'].prefix.lib)
+
+        if '+hdf5' in spec:
+            config_args.extend([
+                "--with-hdf5-includedir=%s" % spec['hdf5'].prefix.include,
+                "--with-hdf5-libdir=%s"     % spec['hdf5'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-hdf5")
+
+        if '+jdk' in spec:
+            config_args.extend([
+                "--with-java-homedir=%s"    % spec['jdk'].prefix,
+                "--with-java-includedir=%s" % spec['jdk'].prefix.include,
+                "--with-java-libdir=%s"     % spec['jdk'].prefix.lib
+            ])
+
+        if '~opengl' in spec:
+            config_args.extend([
+                "--without-opengl",
+                "--without-framework-opengl"
+            ])
+
+        if '+qhull' in spec:
+            config_args.extend([
+                "--with-qhull-includedir=%s" % spec['qhull'].prefix.include,
+                "--with-qhull-libdir=%s"     % spec['qhull'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-qhull")
+
+        if '+qrupdate' in spec:
+            config_args.extend([
+                "--with-qrupdate-includedir=%s" % spec['qrupdate'].prefix.include,
+                "--with-qrupdate-libdir=%s"     % spec['qrupdate'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-qrupdate")
+
+        if '+zlib' in spec:
+            config_args.extend([
+                "--with-z-includedir=%s" % spec['zlib'].prefix.include,
+                "--with-z-libdir=%s"     % spec['zlib'].prefix.lib
+            ])
+        else:
+            config_args.append("--without-z")
+
+        configure(*config_args)
+
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/qrupdate/package.py b/var/spack/repos/builtin/packages/qrupdate/package.py
new file mode 100644
index 0000000000..5374d02c97
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qrupdate/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Qrupdate(Package):
+    """qrupdate is a Fortran library for fast updates of QR and
+    Cholesky decompositions."""
+
+    homepage = "http://sourceforge.net/projects/qrupdate/"
+    url      = "https://downloads.sourceforge.net/qrupdate/qrupdate-1.1.2.tar.gz"
+
+    version('1.1.2', '6d073887c6e858c24aeda5b54c57a8c4')
+
+    depends_on("blas")
+    depends_on("lapack")
+
+    def install(self, spec, prefix):
+        # Build static and dynamic libraries
+        make("lib", "solib")
+        make("install", "PREFIX=%s" % prefix)
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 8391ded3e0..0adf352be2 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -8,6 +8,9 @@ class Qt(Package):
     list_url   = 'http://download.qt-project.org/official_releases/qt/'
     list_depth = 2
 
+    version('5.4.2', 'fa1c4d819b401b267eb246a543a63ea5',
+            url='http://download.qt-project.org/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.gz')
+
     version('5.4.0', 'e8654e4b37dd98039ba20da7a53877e6',
             url='http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.gz')
 
diff --git a/var/spack/repos/builtin/packages/tmux/package.py b/var/spack/repos/builtin/packages/tmux/package.py
index 23d36db427..f2067d1366 100644
--- a/var/spack/repos/builtin/packages/tmux/package.py
+++ b/var/spack/repos/builtin/packages/tmux/package.py
@@ -7,10 +7,11 @@ class Tmux(Package):
        do a lot more.
     """
 
-    homepage = "http://tmux.sourceforge.net"
-    url      = "http://downloads.sourceforge.net/project/tmux/tmux/tmux-1.9/tmux-1.9a.tar.gz"
+    homepage = "http://tmux.github.io"
+    url = "https://github.com/tmux/tmux/releases/download/2.1/tmux-2.1.tar.gz"
 
     version('1.9a', 'b07601711f96f1d260b390513b509a2d')
+    version('2.1', '74a2855695bccb51b6e301383ad4818c')
 
     depends_on('libevent')
     depends_on('ncurses')