diff options
| -rw-r--r-- | lib/spack/spack/spec.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libgit2/package.py | 41 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libssh2/package.py | 48 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-git2/package.py | 50 |
4 files changed, 141 insertions, 1 deletions
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 0df0ff71ea..5c7acfcd95 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -2955,7 +2955,8 @@ class SpecParser(spack.parse.Parser): if not id: id = self.token.value if '.' in id: - self.last_token_error("Identifier cannot contain '.'") + self.last_token_error( + "{0}: Identifier cannot contain '.'".format(id)) def parse(string): diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py new file mode 100644 index 0000000000..d3163e3923 --- /dev/null +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -0,0 +1,41 @@ +############################################################################## +# 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 Libgit2(CMakePackage): + """libgit2 is a portable, pure C implementation of the Git core + methods provided as a re-entrant linkable library with a solid + API, allowing you to write native speed custom Git applications in + any language which supports C bindings. + """ + + homepage = "https://libgit2.github.com/" + url = "https://github.com/libgit2/libgit2/archive/v0.24.2.tar.gz" + + version('0.24.2', '735661b5b73e3c120d13e2bae21e49b3') + + depends_on('cmake@2.8:', type='build') + depends_on('libssh2') diff --git a/var/spack/repos/builtin/packages/libssh2/package.py b/var/spack/repos/builtin/packages/libssh2/package.py new file mode 100644 index 0000000000..2c582b477e --- /dev/null +++ b/var/spack/repos/builtin/packages/libssh2/package.py @@ -0,0 +1,48 @@ +############################################################################## +# 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 Libssh2(CMakePackage): + """libssh2 is a client-side C library implementing the SSH2 protocol""" + + homepage = "https://www.libssh2.org/" + url = "https://www.libssh2.org/download/libssh2-1.7.0.tar.gz" + + version('1.7.0', 'b01662a210e94cccf2f76094db7dac5c') + version('1.4.3', '071004c60c5d6f90354ad1b701013a0b') # CentOS7 + + variant('shared', default=True, + description="Build shared libraries") + + depends_on('cmake@2.8.11:', type='build') + depends_on('openssl') + depends_on('zlib') + depends_on('xz') + + def cmake_args(self): + spec = self.spec + return [ + '-DBUILD_SHARED_LIBS=%s' % ('YES' if '+shared' in spec else 'NO')] diff --git a/var/spack/repos/builtin/packages/py-git2/package.py b/var/spack/repos/builtin/packages/py-git2/package.py new file mode 100644 index 0000000000..a750ecae0e --- /dev/null +++ b/var/spack/repos/builtin/packages/py-git2/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 PyGit2(PythonPackage): + """Pygit2 is a set of Python bindings to the libgit2 shared library, + libgit2 implements the core of Git. + """ + + homepage = "http://www.pygit2.org/" + + version('0.24.1', 'dd98b6a9fded731e36ca5a40484c8545', + url="https://pypi.python.org/packages/aa/56/84dcce942a48d4b7b970cfb7a779b8db1d904e5ec5f71e7a67a63a23a4e2/pygit2-0.24.1.tar.gz") + + extends('python') + depends_on('py-setuptools', type='build') + # Version must match with libgit2 + # See: http://www.pygit2.org/install.html + depends_on('libgit2@0.24:', when='@0.24:') + depends_on('py-six', type=('build', 'run')) + depends_on('py-cffi', type=('build', 'run')) + + def setup_environment(self, spack_env, run_env): + spec = self.spec + # http://www.pygit2.org/install.html + spack_env.set('LIBGIT2', spec['libgit2'].prefix) + spack_env.set('LIBGIT2_LIB', spec['libgit2'].prefix.lib) |