gaudi: fix issue with fmt::format (#37810)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
This commit is contained in:
parent
436f077482
commit
dca3d071d7
22
var/spack/repos/builtin/packages/gaudi/fmt_fix.patch
Normal file
22
var/spack/repos/builtin/packages/gaudi/fmt_fix.patch
Normal 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 );
|
@ -53,6 +53,7 @@ class Gaudi(CMakePackage):
|
|||||||
# fixes for the cmake config which could not find newer boost versions
|
# fixes for the cmake config which could not find newer boost versions
|
||||||
patch("link_target_fixes.patch", when="@33.0:34")
|
patch("link_target_fixes.patch", when="@33.0:34")
|
||||||
patch("link_target_fixes32.patch", when="@:32.2")
|
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
|
# These dependencies are needed for a minimal Gaudi build
|
||||||
depends_on("aida")
|
depends_on("aida")
|
||||||
|
Loading…
Reference in New Issue
Block a user