diff options
| author | Cameron Stanavige <stanavige1@llnl.gov> | 2022-10-03 11:51:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 11:51:05 -0700 |
| commit | db1e32623f81357b69178e93e22c4334db4c8992 (patch) | |
| tree | d771334084b00a3414b2de858a50f3a7b24e8437 | |
| parent | 6e86daf470fb42d7933859f64f3b6a1798176798 (diff) | |
| download | spack-db1e32623f81357b69178e93e22c4334db4c8992.tar.gz spack-db1e32623f81357b69178e93e22c4334db4c8992.tar.bz2 spack-db1e32623f81357b69178e93e22c4334db4c8992.tar.xz spack-db1e32623f81357b69178e93e22c4334db4c8992.zip | |
unifyfs: pin mercury version; add boost variant (#32911)
Mercury has a new version (v2.2) releasing soon that UnifyFS does not build with and hasn't been tested with. This pins UnifyFS to the last version of Mercury used/tested.
Add a variant to avoid building/using boost
Append -std=gnu99 to cflags if building with gcc@4. Needed for mochi-margo to compile
| -rw-r--r-- | var/spack/repos/builtin/packages/unifyfs/package.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/unifyfs/package.py b/var/spack/repos/builtin/packages/unifyfs/package.py index 1de7aa6dd8..3d58448a5e 100644 --- a/var/spack/repos/builtin/packages/unifyfs/package.py +++ b/var/spack/repos/builtin/packages/unifyfs/package.py @@ -39,6 +39,11 @@ class Unifyfs(AutotoolsPackage): default="True", description="Enable automatic mount/unmount in MPI_Init/Finalize", ) + variant( + "boostsys", + default="False", + description="Have Mercury use preprocessor headers from boost dependency", + ) variant("fortran", default="True", description="Build with gfortran support") variant("pmi", default="False", description="Enable PMI2 build options") variant("pmix", default="False", description="Enable PMIx build options") @@ -53,12 +58,16 @@ class Unifyfs(AutotoolsPackage): # Required dependencies depends_on("gotcha@1.0.4:") - depends_on("mercury@1.0.1+bmi", when="@:0.9.1") depends_on("mochi-margo@0.4.3", when="@:0.9.1") depends_on("mochi-margo@0.9.6", when="@0.9.2:1.0") depends_on("mochi-margo@0.9.6:0.9.9", when="@develop") depends_on("mpi") depends_on("openssl@:1") + + # Mochi-Margo dependencies + depends_on("mercury@1.0.1+bmi", when="@:0.9.1") + depends_on("mercury@2.1", when="^mochi-margo@0.9.6:0.9.9") + depends_on("mercury~boostsys", when="~boostsys") depends_on("libfabric fabrics=rxm,sockets,tcp", when="^mercury@2:+ofi") # Optional dependencies @@ -88,6 +97,9 @@ class Unifyfs(AutotoolsPackage): if name in ("cflags", "cppflags"): if "-g" in flags: self.debug_build = True + if name == "cflags": + if self.spec.satisfies("%gcc@4"): + flags.append("-std=gnu99") return (None, None, flags) def setup_build_environment(self, env): |