diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2023-01-23 21:22:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-23 19:22:21 -0800 |
| commit | cd2d6a6397a34244ee9af3f102be801cd0f14d84 (patch) | |
| tree | 33ed2e28a875b8584d309ff2e76336efdeeb26f9 /lib | |
| parent | c5086a5d0efe5686f978887205ea50763f7389da (diff) | |
| download | spack-cd2d6a6397a34244ee9af3f102be801cd0f14d84.tar.gz spack-cd2d6a6397a34244ee9af3f102be801cd0f14d84.tar.bz2 spack-cd2d6a6397a34244ee9af3f102be801cd0f14d84.tar.xz spack-cd2d6a6397a34244ee9af3f102be801cd0f14d84.zip | |
ParaView/VTK: Patch xdmf2 for HDF5 1.13 (#33930)
* ParaView/VTK: Patch xdmf2 for HDF5 1.13
* Meson: update meson build system for 0.64
* ParaView: Change HDF5 1.13 patch to 1.13.1/2 patchs
* Mesa: Remove legacy mesa option from meson_args
* Use append to assemble meson args
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/meson.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py index d059d50cc3..65e0e7ad4f 100644 --- a/lib/spack/spack/build_systems/meson.py +++ b/lib/spack/spack/build_systems/meson.py @@ -120,6 +120,7 @@ class MesonBuilder(BaseBuilder): of package writers. """ # standard Meson arguments + std_meson_args = MesonBuilder.std_args(self.pkg) std_meson_args += getattr(self, "meson_flag_args", []) return std_meson_args @@ -182,7 +183,10 @@ class MesonBuilder(BaseBuilder): def meson(self, pkg, spec, prefix): """Run ``meson`` in the build directory""" - options = [os.path.abspath(self.root_mesonlists_dir)] + options = [] + if self.spec["meson"].satisfies("@0.64:"): + options.append("setup") + options.append(os.path.abspath(self.root_mesonlists_dir)) options += self.std_meson_args options += self.meson_args() with fs.working_dir(self.build_directory, create=True): |