gaudi: fix issue with fmt::format (#37810)

Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
This commit is contained in:
Juan Miguel Carceller 2023-05-22 19:33:05 +02:00 committed by GitHub
parent 436f077482
commit dca3d071d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions

View File

@ -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 );

View File

@ -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")