Merge pull request #6417 from knelli2/release_hot_fix

Couple quick fixes to allow static execs to build after Release
sxs-collaboration · Dec 17, 2024 · a826681 · a826681
2 parents 3085016 + 6ecbe38
commit a826681
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/containers/Dockerfile.buildenv b/containers/Dockerfile.buildenv
@@ -571,4 +571,4 @@ RUN if [ ${UBUNTU_VERSION} != 18.04 ] && [ "$TARGETARCH" != "amd64" ]; then \
     .. \
     && make ${PARALLEL_MAKE_ARG} CharacteristicExtract PreprocessCceWorldtube \
     WriteCceWorldtubeCoordsToFile \
-    && ctest -LE unit -R CharacteristicExtract
+    && ctest -LE unit -R CharacteristicExtract -E KleinGordon
diff --git a/src/Domain/Structure/SegmentId.cpp b/src/Domain/Structure/SegmentId.cpp
@@ -3,7 +3,11 @@
 
 #include "Domain/Structure/SegmentId.hpp"
 
+#if BOOST_VERSION >= 106700
 #include <boost/container_hash/hash.hpp>
+#else
+#include <boost/functional/hash.hpp>
+#endif
 #include <cstddef>
 #include <functional>
 #include <ostream>