diff options
| author | Gregory Lee <lee218@llnl.gov> | 2016-03-29 20:35:00 -0700 |
|---|---|---|
| committer | Gregory Lee <lee218@llnl.gov> | 2016-03-29 20:35:00 -0700 |
| commit | c0173872143575e285f6bd8a710196de42007f9e (patch) | |
| tree | 874286a3628127be9ee4659df9343d148d1e4ae9 /var | |
| parent | 81b9148b9eb7fbce725027a07b90da8d5fcca123 (diff) | |
| parent | 3bd550d6a2ceb279743aae626c6a3a614519d2f5 (diff) | |
| download | spack-c0173872143575e285f6bd8a710196de42007f9e.tar.gz spack-c0173872143575e285f6bd8a710196de42007f9e.tar.bz2 spack-c0173872143575e285f6bd8a710196de42007f9e.tar.xz spack-c0173872143575e285f6bd8a710196de42007f9e.zip | |
Merge pull request #672 from citibeth/efischer/160327-GEOSPython3
[WIP] GEOS Python extension did not compile with Python3.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/geos/package.py | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/geos/package.py b/var/spack/repos/builtin/packages/geos/package.py index 4a2657e32f..030703f286 100644 --- a/var/spack/repos/builtin/packages/geos/package.py +++ b/var/spack/repos/builtin/packages/geos/package.py @@ -1,4 +1,5 @@ from spack import * +import os class Geos(Package): """GEOS (Geometry Engine - Open Source) is a C++ port of the Java @@ -10,6 +11,10 @@ class Geos(Package): homepage = "http://trac.osgeo.org/geos/" url = "http://download.osgeo.org/geos/geos-3.4.2.tar.bz2" + # Verison 3.5.0 supports Autotools and CMake + version('3.5.0', '136842690be7f504fba46b3c539438dd') + + # Versions through 3.4.2 have CMake, but only Autotools is supported version('3.4.2', 'fc5df2d926eb7e67f988a43a92683bae') version('3.4.1', '4c930dec44c45c49cd71f3e0931ded7e') version('3.4.0', 'e41318fc76b5dc764a69d43ac6b18488') @@ -21,11 +26,22 @@ class Geos(Package): version('3.3.4', '1bb9f14d57ef06ffa41cb1d67acb55a1') version('3.3.3', '8454e653d7ecca475153cc88fd1daa26') - extends('python') - depends_on('swig') +# # Python3 is not supported. +# variant('python', default=False, description='Enable Python support') + +# extends('python', when='+python') +# depends_on('python', when='+python') +# depends_on('swig', when='+python') def install(self, spec, prefix): - configure("--prefix=%s" % prefix, - "--enable-python") + args = ["--prefix=%s" % prefix] +# if '+python' in spec: +# os.environ['PYTHON'] = join_path(spec['python'].prefix, 'bin', +# 'python' if spec['python'].version[:1][0] <= 2 else 'python3') +# os.environ['SWIG'] = join_path(spec['swig'].prefix, 'bin', 'swig') +# +# args.append("--enable-python") + + configure(*args) make() make("install") |