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

Remove bundled fmt (#43210)

Browse Source
This commit is contained in:
Thomas Padioleau 2024-03-18 05:43:40 +01:00 committed by GitHub
parent 5ab10d57be
commit 53be280681
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/bear/package.py
View File

@ -35,7 +35,7 @@ class Bear(CMakePackage):
depends_on("fmt@8", when="@3.0.0:")
depends_on("grpc +shared", when="@3.0.0:")
depends_on("nlohmann-json", when="@3.0.0:")
depends_on("spdlog +fmt_external", when="@3.0.0:")
depends_on("spdlog", when="@3.0.0:")
depends_on("cmake@2.8:", when="@2.0.4:", type="build")
depends_on("cmake@3.12:", when="@3.0.0:", type="build")
depends_on("python", type="build")

2
var/spack/repos/builtin/packages/heyoka/package.py
View File

@ -50,7 +50,7 @@ class Heyoka(CMakePackage):
depends_on("llvm@13:17")
depends_on("boost@1.69: +serialization")
depends_on("fmt@9:10")
depends_on("spdlog +fmt_external")
depends_on("spdlog")
depends_on("intel-tbb@2021.4.0:")
# Optional dependencies

17
var/spack/repos/builtin/packages/spdlog/package.py
View File

@ -49,25 +49,20 @@ class Spdlog(CMakePackage):
version("0.9.0", sha256="bbbe5a855c8b309621352921d650449eb2f741d35d55ec50fb4d8122ddfb8f01")
variant("shared", default=True, description="Build shared libraries (v1.4.0+)")
variant(
"fmt_external",
default=False,
description="Build using external fmt libraries instead of bundled one",
)
depends_on("cmake@3.2:", when="@:1.7.0", type="build")
depends_on("cmake@3.10:", when="@1.8.0:", type="build")
depends_on("fmt@5.3:", when="+fmt_external")
depends_on("fmt@7:", when="@1.7: +fmt_external")
depends_on("fmt@8:", when="@1.9: +fmt_external")
depends_on("fmt@9:", when="@1.11: +fmt_external")
depends_on("fmt@5.3:")
depends_on("fmt@7:", when="@1.7:")
depends_on("fmt@8:", when="@1.9:")
depends_on("fmt@9:", when="@1.11:")
# spdlog@1.11.0 with fmt@10 https://github.com/gabime/spdlog/pull/2694
patch(
"https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05.patch?full_index=1",
sha256="31b22a9bfa6790fdabff186c0a9b0fd588439485f05cbef5e661231d15fec49b",
when="@1.11.0 +fmt_external ^fmt@10:",
when="@1.11.0 ^fmt@10:",
)
def cmake_args(self):
@ -77,7 +72,7 @@ def cmake_args(self):
args.extend(
[
self.define_from_variant("SPDLOG_BUILD_SHARED", "shared"),
self.define_from_variant("SPDLOG_FMT_EXTERNAL", "fmt_external"),
self.define("SPDLOG_FMT_EXTERNAL", True),
# tests and examples
self.define("SPDLOG_BUILD_TESTS", self.run_tests),
self.define("SPDLOG_BUILD_EXAMPLE", self.run_tests),