diff options
author | Alex Richert <alexander.richert@noaa.gov> | 2024-05-02 10:42:15 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-02 09:42:15 -0700 |
commit | dea44bad8becc64a439b1fc0ee391a834cace85f (patch) | |
tree | a6236726551face23623184ef1e22c96c22c002e /var | |
parent | e37870ff43514e79d7b520f930270bc41fc52e13 (diff) | |
download | spack-dea44bad8becc64a439b1fc0ee391a834cace85f.tar.gz spack-dea44bad8becc64a439b1fc0ee391a834cace85f.tar.bz2 spack-dea44bad8becc64a439b1fc0ee391a834cace85f.tar.xz spack-dea44bad8becc64a439b1fc0ee391a834cace85f.zip |
grads: fix libpng and g2c deps (#43909)
* grads: fix libpng and g2c deps
* Update package.py
* [@spackbot] updating style on behalf of AlexanderRichert-NOAA
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/grads/package.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/grads/package.py b/var/spack/repos/builtin/packages/grads/package.py index 70146e6720..e384e1a88a 100644 --- a/var/spack/repos/builtin/packages/grads/package.py +++ b/var/spack/repos/builtin/packages/grads/package.py @@ -63,10 +63,14 @@ class Grads(AutotoolsPackage): return url.format(version.up_to(2), version) # Name of grib2 C library has changed in recent versions - with when("+grib2"): + def patch(self): + if self.spec.satisfies("@:2.2.2"): + filter_file("png15", "png", "configure") - def patch(self): + if self.spec.satisfies("+grib2"): filter_file("grib2c", "g2c", "configure") + if self.spec.satisfies("^g2c@1.8.0:"): + filter_file("G2_VERSION", "G2C_VERSION", "src/gacfg.c") def setup_build_environment(self, env): env.set("SUPPLIBS", "/") |