diff options
| author | Chris Marsh <chrismarsh.c2@gmail.com> | 2023-12-20 00:43:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-19 23:43:20 -0700 |
| commit | fd46923216fe049a132a7d1b1a0802aa83e6151b (patch) | |
| tree | 66238963383859e43944acc0123126bcfa856310 | |
| parent | bb2975b7f1e63e176e1b2dd07352ae65c95db762 (diff) | |
| download | spack-fd46923216fe049a132a7d1b1a0802aa83e6151b.tar.gz spack-fd46923216fe049a132a7d1b1a0802aa83e6151b.tar.bz2 spack-fd46923216fe049a132a7d1b1a0802aa83e6151b.tar.xz spack-fd46923216fe049a132a7d1b1a0802aa83e6151b.zip | |
GDAL: Ensure a spack libproj is used instead of a system libproj (#41785)
* Ensure a spack libproj is used instead of a system libproj when libproj < 8.
spack/spack/issues/41299
* Fix style as per ci-bot
* Fix style as per ci-bot
* Ensure 3.5:3.8.
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---------
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/gdal/package.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index 640a1b5ae7..b99de90abc 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -451,6 +451,14 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension): sha256="9f9824296e75b34b3e78284ec772a5ac8f8ba92c17253ea9ca242caf766767ce", ) + # https://github.com/spack/spack/issues/41299 + # ensures the correct build specific libproj is used with cmake builds (gdal >=3.5.0) + patch( + "https://patch-diff.githubusercontent.com/raw/OSGeo/gdal/pull/8964.patch?full_index=1", + when="@3.5:3.8", + sha256="52459dc9903ced5005ba81515762a55cd829d8f5420607405c211c4a77c2bf79", + ) + executables = ["^gdal-config$"] @classmethod |