Skip to content
Snippets Groups Projects

Resolve "spack: use upstream `fmt +shared` when spack version > Fri Sep 17, 2021"

Merged Resolve "spack: use upstream `fmt +shared` when spack version > Fri Sep 17, 2021"
91-spack-use-upstream-fmt-shared-when-spack-version-fri-sep-17-2021 into master
Merged Wouter Deconinck requested to merge 91-spack-use-upstream-fmt-shared-when-spack-version-fri-sep-17-2021 into master
Compare
and
5 files
+ 1
− 130
Compare changes
  • Side-by-side
  • Inline
Files
5
spack/packages/fmt/fmt-attributes-cpp11_4.1.0.patch deleted 100644 → 0
+ 0
− 13
diff --git a/fmt/format.h b/fmt/format.h
index 561a9e0..9faf5ca 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -153,7 +153,7 @@ typedef __int64 intmax_t;
# define FMT_HAS_CPP_ATTRIBUTE(x) 0
#endif
-#if FMT_HAS_CPP_ATTRIBUTE(maybe_unused)
+#if FMT_HAS_CPP_ATTRIBUTE(maybe_unused) && __cplusplus >= 201103L
# define FMT_HAS_CXX17_ATTRIBUTE_MAYBE_UNUSED
// VC++ 1910 support /std: option and that will set _MSVC_LANG macro
// Clang with Microsoft CodeGen doesn't define _MSVC_LANG macro