diff options
| author | Martin Aumüller <aumuell@reserv.at> | 2023-07-20 23:44:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-20 17:44:13 -0400 |
| commit | 6610b8bc275edb9d78448693c994ba49647d9f6b (patch) | |
| tree | 1ead7e3aa60a16c06ea3503d37da41994b0220a7 | |
| parent | d3c4b74095d8a33406fd0ec25f03ae3f28f88346 (diff) | |
| download | spack-6610b8bc275edb9d78448693c994ba49647d9f6b.tar.gz spack-6610b8bc275edb9d78448693c994ba49647d9f6b.tar.bz2 spack-6610b8bc275edb9d78448693c994ba49647d9f6b.tar.xz spack-6610b8bc275edb9d78448693c994ba49647d9f6b.zip | |
proj: fix build of v7 with GCC 13 & add 9.2.1 (#39004)
* proj: fix building with GCC 13
apply upstream patch from 7.2 branch
* proj: checksum 9.2.1
* proj: fix sha256 of patch
thank you, @adamjstewart
| -rw-r--r-- | var/spack/repos/builtin/packages/proj/package.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index eb3c16d6ba..065703c64f 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -23,6 +23,7 @@ class Proj(CMakePackage, AutotoolsPackage): # 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("9.2.1", sha256="15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1") version("9.2.0", sha256="dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e") version("9.1.1", sha256="003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39") version("9.1.0", sha256="81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315") @@ -76,6 +77,12 @@ class Proj(CMakePackage, AutotoolsPackage): when="@:6", ) + patch( + "https://github.com/OSGeo/PROJ/commit/3f38a67a354a3a1e5cca97793b9a43860c380d95.patch?full_index=1", + sha256="dc620ff1bbcc0ef4130d53a40a8693a1e2e72ebf83bd6289f1139d0f1aad2a40", + when="@7:7.2.1", + ) + # https://proj.org/install.html#build-requirements with when("build_system=cmake"): depends_on("cmake@3.9:", when="@6:", type="build") |