diff options
| author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2023-05-22 19:33:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 10:33:05 -0700 |
| commit | dca3d071d778cb7ca85166028acb5b866124157c (patch) | |
| tree | 75fb316a6ff3274ae8a0ead82d21d7b41a0ddc4b | |
| parent | 436f077482fbd2df4ee5b9c3c161240558b4080f (diff) | |
| download | spack-dca3d071d778cb7ca85166028acb5b866124157c.tar.gz spack-dca3d071d778cb7ca85166028acb5b866124157c.tar.bz2 spack-dca3d071d778cb7ca85166028acb5b866124157c.tar.xz spack-dca3d071d778cb7ca85166028acb5b866124157c.zip | |
gaudi: fix issue with fmt::format (#37810)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/gaudi/fmt_fix.patch | 22 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gaudi/package.py | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gaudi/fmt_fix.patch b/var/spack/repos/builtin/packages/gaudi/fmt_fix.patch new file mode 100644 index 0000000000..f821095bdd --- /dev/null +++ b/var/spack/repos/builtin/packages/gaudi/fmt_fix.patch @@ -0,0 +1,22 @@ +diff --git a/GaudiHive/src/FetchLeavesFromFile.cpp b/GaudiHive/src/FetchLeavesFromFile.cpp +index 55c60e6a1..5ed8efa91 100644 +--- a/GaudiHive/src/FetchLeavesFromFile.cpp ++++ b/GaudiHive/src/FetchLeavesFromFile.cpp +@@ -67,7 +67,7 @@ namespace Gaudi { + DataObject* obj = nullptr; + evtSvc() + ->retrieveObject( m_rootNode, obj ) +- .orThrow( fmt::format( "failed to retrieve {} from {}", m_rootNode.value(), m_dataSvcName ), name() ); ++ .orThrow( fmt::format( "failed to retrieve {} from {}", m_rootNode.value(), m_dataSvcName.value() ), name() ); + } + // result + IDataStoreLeaves::LeavesList all_leaves; +@@ -93,7 +93,7 @@ namespace Gaudi { + ->retrieveObject( reg->identifier(), obj ) + .orElse( [&]() { + failure_msg = +- fmt::format( "failed to retrieve {} from {}", reg->identifier(), m_dataSvcName ); ++ fmt::format( "failed to retrieve {} from {}", reg->identifier(), m_dataSvcName.value() ); + // we do not really care about the exception we throw because traverseSubTree will just use + // it to abort the traversal + throw GaudiException( failure_msg, name(), StatusCode::FAILURE ); diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 343bf4be34..4011b677a8 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -53,6 +53,7 @@ class Gaudi(CMakePackage): # fixes for the cmake config which could not find newer boost versions patch("link_target_fixes.patch", when="@33.0:34") patch("link_target_fixes32.patch", when="@:32.2") + patch("fmt_fix.patch", when="@36.6:36.12 ^fmt@10:") # These dependencies are needed for a minimal Gaudi build depends_on("aida") |