zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eccodes: fix a few issues in the recipe (#38873)

Browse Source 
* explicitly disable the Python 2 interface

* drop obsolete cmake argument HDF5_ROOT for newer versions

* set PYTHON_EXECUTABLE only when needed
This commit is contained in:
Sergey Kosukhin 2023-07-13 19:53:19 +02:00 committed by GitHub
parent 82d41a7be4
commit afe6f7ed79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/eccodes/package.py
View File

@ -321,6 +321,9 @@ def cmake_args(self):
self.define_from_variant("ENABLE_ECCODES_THREADS", "pthreads"), self.define_from_variant("ENABLE_ECCODES_THREADS", "pthreads"),
self.define_from_variant("ENABLE_ECCODES_OMP_THREADS", "openmp"), self.define_from_variant("ENABLE_ECCODES_OMP_THREADS", "openmp"),
self.define_from_variant("ENABLE_MEMFS", "memfs"), self.define_from_variant("ENABLE_MEMFS", "memfs"),
self.define(
"ENABLE_PYTHON{0}".format("2" if self.spec.satisfies("@2.20.0:") else ""), False
),
self.define_from_variant("ENABLE_FORTRAN", "fortran"), self.define_from_variant("ENABLE_FORTRAN", "fortran"),
self.define("BUILD_SHARED_LIBS", "BOTH" if "+shared" in self.spec else "OFF"), self.define("BUILD_SHARED_LIBS", "BOTH" if "+shared" in self.spec else "OFF"),
self.define("ENABLE_TESTS", self.run_tests), self.define("ENABLE_TESTS", self.run_tests),
@ -332,15 +335,14 @@ def cmake_args(self):
] ]
if "+netcdf" in self.spec: if "+netcdf" in self.spec:
args.extend( # Prevent possible overriding by environment variables NETCDF_ROOT, NETCDF_DIR, and
[ # NETCDF_PATH:
# Prevent possible overriding by environment variables args.append(self.define("NETCDF_PATH", self.spec["netcdf-c"].prefix))
# NETCDF_ROOT, NETCDF_DIR, and NETCDF_PATH: # Prevent overriding by environment variable HDF5_ROOT (starting version 2.14.0,
self.define("NETCDF_PATH", self.spec["netcdf-c"].prefix), # ecCodes is shipped with ecBuild 3.1.0+, which does not seem to rely on the HDF5_ROOT
# Prevent overriding by environment variable HDF5_ROOT: # variable):
self.define("HDF5_ROOT", self.spec["hdf5"].prefix), if self.spec.satisfies("@:2.13"):
] args.append(self.define("HDF5_ROOT", self.spec["hdf5"].prefix))
)
if jp2k == "openjpeg": if jp2k == "openjpeg":
args.append(self.define("OPENJPEG_PATH", self.spec["openjpeg"].prefix)) args.append(self.define("OPENJPEG_PATH", self.spec["openjpeg"].prefix))
@ -352,7 +354,7 @@ def cmake_args(self):
# Prevent overriding by environment variables AEC_DIR and AEC_PATH: # Prevent overriding by environment variables AEC_DIR and AEC_PATH:
args.append(self.define("AEC_DIR", self.spec["libaec"].prefix)) args.append(self.define("AEC_DIR", self.spec["libaec"].prefix))
if "^python" in self.spec: if "+memfs" in self.spec:
args.append(self.define("PYTHON_EXECUTABLE", python.path)) args.append(self.define("PYTHON_EXECUTABLE", python.path))
definitions = self.spec.variants["definitions"].value definitions = self.spec.variants["definitions"].value