diff options
28 files changed, 390 insertions, 33 deletions
@@ -3,6 +3,7 @@ [](https://travis-ci.org/LLNL/spack) [](https://codecov.io/gh/LLNL/spack) +[](https://spack.readthedocs.io) Spack is a package management tool designed to support multiple versions and configurations of software on a wide variety of platforms diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst index ea8d50c6ca..96b4436683 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst @@ -336,6 +336,10 @@ your command. If it isn't used very frequently, changes to the rest of Spack can cause your command to break without sufficient unit tests to prevent this from happening. +Whenever you add/remove/rename a command or flags for an existing command, +make sure to update Spack's `Bash tab completion script +<https://github.com/adamjstewart/spack/blob/develop/share/spack/spack-completion.bash>`_. + ---------- Unit tests ---------- diff --git a/lib/spack/docs/tutorial_basics.rst b/lib/spack/docs/tutorial_basics.rst index 8d9a8fbaea..6bd5dad604 100644 --- a/lib/spack/docs/tutorial_basics.rst +++ b/lib/spack/docs/tutorial_basics.rst @@ -574,7 +574,7 @@ You may also have noticed that there are some packages shown in the dependencies that were installed implicitly. A few packages installed implicitly are not shown as dependencies in the ``spack find -d`` output. These are build dependencies. For example, ``libpciaccess`` is a -dependency of openmpi and requires m4 to build. Spack will build `m4`` as +dependency of openmpi and requires ``m4`` to build. Spack will build ``m4`` as part of the installation of ``openmpi``, but it does not become a part of the DAG because it is not linked in at run time. Spack handles build dependencies differently because of their different (less strict) @@ -951,7 +951,7 @@ You can control how the output is displayed with a number of options. The ASCII output from ``spack graph`` can be difficult to parse for complicated packages. The output can be changed to the ``graphviz`` -``.dot`` format using the `--dot` flag. +``.dot`` format using the ``--dot`` flag. .. code-block:: console @@ -1093,13 +1093,13 @@ packages at once. Advanced ``spack find`` Usage ----------------------------- -We will go over some additional uses for the `spack find` command not +We will go over some additional uses for the ``spack find`` command not already covered in the :ref:`basics-tutorial-install` and :ref:`basics-tutorial-uninstall` sections. The ``spack find`` command can accept what we call "anonymous specs." These are expressions in spec syntax that do not contain a package -name. For example, `spack find %intel` will return every package built +name. For example, ``spack find %intel`` will return every package built with the intel compiler, and ``spack find cppflags="-O3"`` will return every package which was built with ``cppflags="-O3"``. diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index 146c153041..ed8bad1a9b 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -61,12 +61,20 @@ class Pgi(Compiler): @classmethod def default_version(cls, comp): - """The '-V' option works for all the PGI compilers. + """The ``-V`` option works for all the PGI compilers. Output looks like this:: pgcc 15.10-0 64-bit target on x86-64 Linux -tp sandybridge The Portland Group - PGI Compilers and Tools Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. + + on x86-64, and:: + + pgcc 17.4-0 linuxpower target on Linuxpower + PGI Compilers and Tools + Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. + + on PowerPC. """ return get_compiler_version( - comp, '-V', r'pg[^ ]* ([^ ]+) \d\d\d?-bit target') + comp, '-V', r'pg[^ ]* ([0-9.-]+) [^ ]+ target on ') diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 399f58461f..ff213c5986 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -966,15 +966,12 @@ class Spec(object): # Spec(a, b) will copy a but just add b as a dep. deptypes = () for dep in dep_like: - if isinstance(dep, Spec): - spec = dep - elif isinstance(dep, (list, tuple)): + + if isinstance(dep, (list, tuple)): # Literals can be deptypes -- if there are tuples in the # list, they will be used as deptypes for the following Spec. deptypes = tuple(dep) continue - else: - spec = Spec(dep) spec = dep if isinstance(dep, Spec) else Spec(dep) self._add_dependency(spec, deptypes) diff --git a/lib/spack/spack/util/multiproc.py b/lib/spack/spack/util/multiproc.py index 91bac57c26..f465a3dbdc 100644 --- a/lib/spack/spack/util/multiproc.py +++ b/lib/spack/spack/util/multiproc.py @@ -92,5 +92,5 @@ class Barrier: self.turnstile2.release() -class BarrierTimeoutError: +class BarrierTimeoutError(Exception): pass diff --git a/var/spack/repos/builtin/packages/bamtools/package.py b/var/spack/repos/builtin/packages/bamtools/package.py index 6ad90c779b..79e71cc0f2 100644 --- a/var/spack/repos/builtin/packages/bamtools/package.py +++ b/var/spack/repos/builtin/packages/bamtools/package.py @@ -23,9 +23,10 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os -class Bamtools(Package): +class Bamtools(CMakePackage): """C++ API & command-line toolkit for working with BAM data.""" homepage = "https://github.com/pezmaster31/bamtools" @@ -36,11 +37,11 @@ class Bamtools(Package): version('2.3.0', 'd327df4ba037d6eb8beef65d7da75ebc') version('2.2.3', '6eccd3e45e4ba12a68daa3298998e76d') - depends_on('cmake', type='build') + depends_on('zlib', type='link') - def install(self, spec, prefix): - with working_dir('spack-build', create=True): - cmake('..', *std_cmake_args) - - make() - make('install') + def cmake_args(self): + args = [] + rpath = self.rpath + rpath.append(os.path.join(self.prefix.lib, "bamtools")) + args.append("-DCMAKE_INSTALL_RPATH=%s" % ':'.join(rpath)) + return args diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index d4c772ed03..c0aa582d72 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -164,7 +164,7 @@ class Boost(Package): if spec.satisfies('@1.47:'): toolsets['icpc'] += '-linux' - for cc, toolset in toolsets.iteritems(): + for cc, toolset in toolsets.items(): if cc in self.compiler.cxx_names: return toolset diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 7a48f651c3..6f8a3e8625 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -31,8 +31,9 @@ class Curl(AutotoolsPackage): homepage = "http://curl.haxx.se" # URL must remain http:// so Spack can bootstrap curl - url = "http://curl.haxx.se/download/curl-7.53.1.tar.bz2" + url = "http://curl.haxx.se/download/curl-7.54.0.tar.bz2" + version('7.54.0', '89bb7ba87384dfbf4f1a3f953da42458') version('7.53.1', 'fb1f03a142236840c1a77c035fa4c542') version('7.52.1', 'dd014df06ff1d12e173de86873f9f77a') version('7.50.3', 'bd177fd6deecce00cfa7b5916d831c5e') diff --git a/var/spack/repos/builtin/packages/gmp/package.py b/var/spack/repos/builtin/packages/gmp/package.py index 45e8b8a452..b318273b0b 100644 --- a/var/spack/repos/builtin/packages/gmp/package.py +++ b/var/spack/repos/builtin/packages/gmp/package.py @@ -30,7 +30,7 @@ class Gmp(AutotoolsPackage): on signed integers, rational numbers, and floating-point numbers.""" homepage = "https://gmplib.org" - url = "https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2" + url = "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.bz2" version('6.1.2', '8ddbb26dc3bd4e2302984debba1406a5') version('6.1.1', '4c175f86e11eb32d8bf9872ca3a8e11d') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 8df01f4b67..6651ab02bc 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -45,12 +45,15 @@ class Jdk(Package): '-H', # specify required License Agreement cookie 'Cookie: oraclelicense=accept-securebackup-cookie'] - version('8u66', '88f31f3d642c3287134297b8c10e61bf', - url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz", - curl_options=curl_options) version('8u92', '65a1cc17ea362453a6e0eb4f13be76e4', url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz", curl_options=curl_options) + version('8u73', '1b0120970aa8bc182606a16bf848a686', + url="http://download.oracle.com/otn-pub/java/jdk/8u73-b02/jdk-8u73-linux-x64.tar.gz", + curl_options=curl_options) + version('8u66', '88f31f3d642c3287134297b8c10e61bf', + url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz", + curl_options=curl_options) def install(self, spec, prefix): distutils.dir_util.copy_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index 625a044572..87f0883fba 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -36,8 +36,9 @@ class Lmod(AutotoolsPackage): """ homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' - url = 'https://github.com/TACC/Lmod/archive/7.3.tar.gz' + url = 'https://github.com/TACC/Lmod/archive/7.4.9.tar.gz' + version('7.4.9', 'd8ffab81ddca2491fe13e2ac0a4fd320') version('7.4.8', '3b22932437cc29ce546ec887885355e7') version('7.4.5', 'fc34029c60dd9782c3d011c2b93fd266') version('7.4.1', '59b2558ee50877f2cf49ed37d7b09fea') diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py index 1a86dfdb81..2d88fa1522 100644 --- a/var/spack/repos/builtin/packages/mpfr/package.py +++ b/var/spack/repos/builtin/packages/mpfr/package.py @@ -30,14 +30,15 @@ class Mpfr(AutotoolsPackage): floating-point computations with correct rounding.""" homepage = "http://www.mpfr.org" - url = "https://gforge.inria.fr/frs/download.php/latestfile/159/mpfr-3.1.2.tar.bz2" + url = "https://ftp.gnu.org/gnu/mpfr/mpfr-3.1.5.tar.bz2" version('3.1.5', 'b1d23a55588e3b2a13e3be66bc69fd8d') version('3.1.4', 'b8a2f6b0e68bef46e53da2ac439e1cf4') version('3.1.3', '5fdfa3cfa5c86514ee4a241a1affa138') version('3.1.2', 'ee2c3ac63bf0c2359bf08fc3ee094c19') - depends_on('gmp@4.1.0:') # mpir is a drop-in replacement for this + # mpir is a drop-in replacement for gmp + depends_on('gmp@4.1.0:') # 4.2.3 or higher is recommended patch('vasprintf.patch', when='@3.1.5') patch('strtofr.patch', when='@3.1.5') diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index b052cfa12a..162939167c 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -42,6 +42,7 @@ class Opencv(Package): homepage = 'http://opencv.org/' url = 'https://github.com/Itseez/opencv/archive/3.1.0.tar.gz' + version('3.2.0', 'a43b65488124ba33dde195fea9041b70') version('3.1.0', '70e1dd07f0aa06606f1bc0e3fa15abd3') variant('shared', default=True, diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index fcd33eadcb..15c4f8fdd4 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -140,7 +140,7 @@ def rewrite_environ_files(environ, **kwargs): """ posix = kwargs.get('posix', None) if posix and isfile(posix): - for k, v in environ.iteritems(): + for k, v in environ.items(): filter_file( r'^(\s*export\s+%s)=.*$' % k, r'\1=%s' % v, @@ -148,7 +148,7 @@ def rewrite_environ_files(environ, **kwargs): backup=False) cshell = kwargs.get('cshell', None) if cshell and isfile(cshell): - for k, v in environ.iteritems(): + for k, v in environ.items(): filter_file( r'^(\s*setenv\s+%s)\s+.*$' % k, r'\1 %s' % v, @@ -616,7 +616,7 @@ echo WM_PROJECT_DIR = $WM_PROJECT_DIR cshell=join_path('etc', 'prefs.csh')) # Adjust components to use SPACK variants - for component, subdict in self.etc_config.iteritems(): + for component, subdict in self.etc_config.items(): write_environ( subdict, posix=join_path('etc', 'config.sh', component), diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 19ffd40507..53be5f6337 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -386,7 +386,7 @@ echo WM_PROJECT_DIR = $WM_PROJECT_DIR cshell=join_path('etc', 'prefs.csh')) # Adjust components to use SPACK variants - for component, subdict in self.etc_config.iteritems(): + for component, subdict in self.etc_config.items(): write_environ( subdict, posix=join_path('etc', 'config.sh', component), diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index dc1f7be93c..10895f6089 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -50,6 +50,7 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # Misc releases that people need version('5.22.2', '5767e2a10dd62a46d7b57f74a90d952b') + version('5.22.1', '19295bbb775a3c36123161b9bf4892f1') # End of life releases version('5.20.3', 'd647d0ea5a7a8194c34759ab9f2610cd') diff --git a/var/spack/repos/builtin/packages/py-asn1crypto/package.py b/var/spack/repos/builtin/packages/py-asn1crypto/package.py new file mode 100644 index 0000000000..838a8a4182 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-asn1crypto/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyAsn1crypto(PythonPackage): + """Python ASN.1 library with a focus on performance and a pythonic API """ + + homepage = "https://github.com/wbond/asn1crypto" + url = "https://pypi.io/packages/source/a/asn1crypto/asn1crypto-0.22.0.tar.gz" + + version('0.22.0', '74a8b9402625b38ef19cf3fa69ef8470') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py new file mode 100644 index 0000000000..93531acc21 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyCryptography(PythonPackage): + """cryptography is a package which provides cryptographic recipes + and primitives to Python developers""" + + homepage = "https://pypi.python.org/pypi/cryptography" + url = "https://pypi.io/packages/source/c/cryptography/cryptography-1.8.1.tar.gz" + + version('1.8.1', '9f28a9c141995cd2300d0976b4fac3fb') + + # dependencies taken from https://github.com/pyca/cryptography/blob/master/setup.py + depends_on('py-setuptools@20.5:', type='build') + depends_on('py-cffi@1.4.1:', type=('build', 'run')) + depends_on('py-asn1crypto@0.21.0:', type=('build', 'run')) + depends_on('py-six@1.4.1:', type=('build', 'run')) + depends_on('py-idna@2.1:', type=('build', 'run')) + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.4') + depends_on('py-ipaddress', type=('build', 'run'), when='^python@:3.3') + depends_on('openssl') diff --git a/var/spack/repos/builtin/packages/py-idna/package.py b/var/spack/repos/builtin/packages/py-idna/package.py new file mode 100644 index 0000000000..5a191430f2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-idna/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyIdna(PythonPackage): + """Internationalized Domain Names for Python (IDNA 2008 and UTS #46) """ + + homepage = "https://github.com/kjd/idna" + url = "https://pypi.io/packages/source/i/idna/idna-2.5.tar.gz" + + version('2.5', 'fc1d992bef73e8824db411bb5d21f012') + + depends_on('py-setuptools', type=('build', 'link')) + depends_on('python@2.6:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ipaddress/package.py b/var/spack/repos/builtin/packages/py-ipaddress/package.py new file mode 100644 index 0000000000..5e088ed75e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-ipaddress/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyIpaddress(PythonPackage): + """Python 3.3's ipaddress for older Python versions""" + + homepage = "https://github.com/phihag/ipaddress" + url = "https://pypi.io/packages/source/i/ipaddress/ipaddress-1.0.18.tar.gz" + + version('1.0.18', '310c2dfd64eb6f0df44aa8c59f2334a7') + + depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-paramiko/package.py b/var/spack/repos/builtin/packages/py-paramiko/package.py new file mode 100644 index 0000000000..94ddb85ec2 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-paramiko/package.py @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyParamiko(PythonPackage): + """SSH2 protocol library""" + + homepage = "http://www.paramiko.org/" + url = "https://pypi.io/packages/source/p/paramiko/paramiko-2.1.2.tar.gz" + + version('2.1.2', '41a8ea0e8abb03a6bf59870670d4f46c') + + depends_on('py-setuptools', type='build') + depends_on('py-pyasn1@0.1.7:', type=('build', 'run')) + depends_on('py-cryptography@1.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyasn1/package.py b/var/spack/repos/builtin/packages/py-pyasn1/package.py new file mode 100644 index 0000000000..885ef06389 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyasn1/package.py @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyPyasn1(PythonPackage): + """ Generic ASN.1 library for Python http://pyasn1.sf.net""" + + homepage = "https://github.com/etingof/pyasn1" + url = "https://pypi.io/packages/source/p/pyasn1/pyasn1-0.2.3.tar.gz" + + version('0.2.3', '79f98135071c8dd5c37b6c923c51be45') + depends_on('py-setuptools', type='build') + depends_on('python@2.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pycrypto/package.py b/var/spack/repos/builtin/packages/py-pycrypto/package.py new file mode 100644 index 0000000000..e791d38cf1 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pycrypto/package.py @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 PyPycrypto(PythonPackage): + """The Python Cryptography Toolkit""" + + homepage = "https://www.dlitz.net/software/pycrypto/" + url = "https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.1.tar.gz" + + version('2.6.1', '55a61a054aa66812daf5161a0d5d7eda') + + # depends_on('py-setuptools', type='build') + depends_on('gmp') diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py index ba3417caa0..948de4340e 100644 --- a/var/spack/repos/builtin/packages/r/package.py +++ b/var/spack/repos/builtin/packages/r/package.py @@ -40,6 +40,7 @@ class R(AutotoolsPackage): extendable = True + version('3.3.3', '0ac211ec15e813a24f8f4a5a634029a4') version('3.3.2', '2437014ef40641cdc9673e89c040b7a8') version('3.3.1', 'f50a659738b73036e2f5635adbd229c5') version('3.3.0', '5a7506c8813432d1621c9725e86baf7a') diff --git a/var/spack/repos/builtin/packages/scala/package.py b/var/spack/repos/builtin/packages/scala/package.py new file mode 100644 index 0000000000..1a4ac51ca3 --- /dev/null +++ b/var/spack/repos/builtin/packages/scala/package.py @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created 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 Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, 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 Lesser 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 Scala(Package): + """Scala is a general-purpose programming language providing support for + functional programming and a strong static type system. Designed to be + concise, many of Scala's design decisions were designed to build from + criticisms of Java. + """ + + homepage = "https://www.scala-lang.org/" + url = "https://downloads.lightbend.com/scala/2.12.1/scala-2.12.1.tgz" + + depends_on('jdk') + version('2.12.1', '3eaecbce019b0fa3067503846e292b32') + + def install(self, spec, prefix): + + def install_dir(dirname): + install_tree(dirname, join_path(prefix, dirname)) + + install_dir('bin') + install_dir('lib') + install_dir('doc') + install_dir('man') diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 5778c976ad..43d24c61d1 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -46,6 +46,8 @@ class Zlib(Package): variant('shared', default=True, description='Enables the build of shared libraries.') + patch('w_patch.patch', when="@1.2.11%cce") + def setup_environment(self, spack_env, run_env): if '+pic' in self.spec: spack_env.set('CFLAGS', self.compiler.pic_flag) diff --git a/var/spack/repos/builtin/packages/zlib/w_patch.patch b/var/spack/repos/builtin/packages/zlib/w_patch.patch new file mode 100644 index 0000000000..756cff6a78 --- /dev/null +++ b/var/spack/repos/builtin/packages/zlib/w_patch.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index e974d1f..ed26a63 100755 +--- a/configure ++++ b/configure +@@ -409,7 +409,7 @@ EOF + if test $shared -eq 1; then + echo Checking for shared library support... | tee -a configure.log + # we must test in two steps (cc then ld), required at least on SunOS 4.x +- if try $CC -w -c $SFLAGS $test.c && ++ if try $CC -c $SFLAGS $test.c && + try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then + echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log + elif test -z "$old_cc" -a -z "$old_cflags"; then |