diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-29 17:13:37 -0700 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-03-29 17:13:37 -0700 |
commit | e4de235e75c5124b226593312cc91be34c4f8260 (patch) | |
tree | ea51934a553f9a4723b93c6812f86662adcc6a6c /var | |
parent | c337b52ec84b5d45b86cc7233683a25978bbe427 (diff) | |
parent | abee9c83b440b8341be6df1f07c7c5f1bef9dd89 (diff) | |
download | spack-e4de235e75c5124b226593312cc91be34c4f8260.tar.gz spack-e4de235e75c5124b226593312cc91be34c4f8260.tar.bz2 spack-e4de235e75c5124b226593312cc91be34c4f8260.tar.xz spack-e4de235e75c5124b226593312cc91be34c4f8260.zip |
Merge pull request #653 from citibeth/efischer/160325-Cython3Fix
Added new Cython version; old versions don't work with Python3.
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/googletest/package.py | 24 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-cython/package.py | 8 |
2 files changed, 30 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/googletest/package.py b/var/spack/repos/builtin/packages/googletest/package.py new file mode 100644 index 0000000000..663b758747 --- /dev/null +++ b/var/spack/repos/builtin/packages/googletest/package.py @@ -0,0 +1,24 @@ +from spack import * + +class Googletest(Package): + """Google test framework for C++. Also called gtest.""" + homepage = "https://github.com/google/googletest" + url = "https://github.com/google/googletest/tarball/release-1.7.0" + + version('1.7.0', '5eaf03ed925a47b37c8e1d559eb19bc4') + + depends_on("cmake") + + def install(self, spec, prefix): + which('cmake')('.', *std_cmake_args) + + make() + + # Google Test doesn't have a make install + # We have to do our own install here. + install_tree('include', prefix.include) + + mkdirp(prefix.lib) + install('./libgtest.a', '%s' % prefix.lib) + install('./libgtest_main.a', '%s' % prefix.lib) + diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 68eb735ad9..072355026e 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -3,10 +3,14 @@ from spack import * class PyCython(Package): """The Cython compiler for writing C extensions for the Python language.""" homepage = "https://pypi.python.org/pypi/cython" - url = "https://pypi.python.org/packages/source/C/Cython/cython-0.22.tar.gz" + url = "https://pypi.python.org/packages/source/C/Cython/Cython-0.22.tar.gz" - version('0.21.2', 'd21adb870c75680dc857cd05d41046a4') + version('0.23.5', '66b62989a67c55af016c916da36e7514') + version('0.23.4', '157df1f69bcec6b56fd97e0f2e057f6e') + + # These versions contain illegal Python3 code... version('0.22', '1ae25add4ef7b63ee9b4af697300d6b6') + version('0.21.2', 'd21adb870c75680dc857cd05d41046a4') extends('python') |