diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-06-17 22:46:42 -0500 |
|---|---|---|
| committer | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2019-06-17 23:46:42 -0400 |
| commit | 6422130709a97147dabbfc08a2b7fd5fd87e44c7 (patch) | |
| tree | fe7071244cbaa6de2e512c365d38f5de10c7b9c6 | |
| parent | 1891734195a50e7a5217e82693c857d9cfccc407 (diff) | |
| download | spack-6422130709a97147dabbfc08a2b7fd5fd87e44c7.tar.gz spack-6422130709a97147dabbfc08a2b7fd5fd87e44c7.tar.bz2 spack-6422130709a97147dabbfc08a2b7fd5fd87e44c7.tar.xz spack-6422130709a97147dabbfc08a2b7fd5fd87e44c7.zip | |
Add PROJ.6 (#11730)
* Add PROJ.6
* Add back comment about newer PROJ API
| -rw-r--r-- | var/spack/repos/builtin/packages/proj/package.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 67f27dea6a..d1228ad937 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -12,14 +12,16 @@ class Proj(AutotoolsPackage): another. This includes cartographic projections as well as geodetic transformations.""" - homepage = "https://proj4.org/" - url = "http://download.osgeo.org/proj/proj-5.0.1.tar.gz" - - # Version 6.0.0 deprecates the older API, and things which do - # not know this will fail to build. So, I recommend that we - # do not put in 6.x until you are ready to put in selective - # dependencies in all packages which depend on proj. I have - # done libgeotiff, but there are lots of others. + homepage = "https://proj.org/" + url = "http://download.osgeo.org/proj/proj-6.1.0.tar.gz" + + maintainers = ['adamjstewart'] + + # Version 6 removes projects.h, while version 7 removes proj_api.h. + # Many packages that depend on proj do not yet support the newer API. + # See https://github.com/OSGeo/PROJ/wiki/proj.h-adoption-status + version('6.1.0', sha256='676165c54319d2f03da4349cbd7344eb430b225fe867a90191d848dc64788008') + version('6.0.0', sha256='4510a2c1c8f9056374708a867c51b1192e8d6f9a5198dd320bf6a168e44a3657') version('5.2.0', 'ad285c7d03cbb138d9246e10e1f3191c') version('5.1.0', '68c46f6da7e4cd5708f83fe47af80db6') version('5.0.1', '15c8d7d6a8cb945c7878d0ff322a232c') @@ -38,7 +40,8 @@ class Proj(AutotoolsPackage): placement='nad' ) - # @6 appears to be the first version which makes use of sqlite at all. + # @6 appears to be the first version with dependencies + depends_on('pkgconfig@0.9.0:', type='build', when='@6:') depends_on('sqlite@3.7:', when='@6:') def configure_args(self): |