From fd46923216fe049a132a7d1b1a0802aa83e6151b Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Wed, 20 Dec 2023 00:43:20 -0600 Subject: 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 --------- Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/gdal/package.py | 8 ++++++++ 1 file changed, 8 insertions(+) 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 -- cgit v1.2.3-60-g2f50