FD38: catalyst: add extra gcc include (cstdint)

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index b3ee309be2259939c6a5f0f40071776f158795be..2bdadee64648aad56c6d638b26ac09439b77cba3 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -331,7 +331,8 @@ __overwrite__ :
         'APPLICATION.products.numpy'            : {tag: '1.22.2',    base: 'no', section: 'version_1_22_2'                      }
         'APPLICATION.products.PyFMI'            : {tag: '2.6',       base: 'no', section: 'version_2_6_FD38'                    }
         'APPLICATION.products.medfile'          : {tag: '4.1.1',     base: 'no', section: 'version_4_1_1_FD38'                  }
-        'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no',  section: 'version_5_11_0_MPI_FD38', hpc: 'yes'}
+        'APPLICATION.products.catalyst'         : {tag: '2.0',       base: 'no', section: 'version_2_0_FD38'                    }
+        'APPLICATION.products.ParaView'         : {tag: '5.11.0',    base: 'no', section: 'version_5_11_0_MPI_FD38', hpc: 'yes' }
         'APPLICATION.products.CONFIGURATION'    : {tag:'master',     base: 'no', section: 'default'                             }
         'APPLICATION.products.SHAPER'           : {tag:'master',     base: 'no', section: 'default',                  hpc: 'no' }
     }

diff --git a/products/catalyst.pyconf b/products/catalyst.pyconf
index 08bd4213d75d0226b04e052c9968eeb84623f388..2af498d45cd1e77ca8aad019d9d302e2ddbb29ac 100644 (file)
--- a/products/catalyst.pyconf
+++ b/products/catalyst.pyconf
@@ -34,4 +34,10 @@ version_2_0:
 {
     archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
 }
+
+version_2_0_FD38:
+{
+    archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
+    patches : ['catalyst-2.0.p001.patch']
+}
   
\ No newline at end of file

diff --git a/products/patches/catalyst-2.0.p001.patch b/products/patches/catalyst-2.0.p001.patch
new file mode 100644 (file)
index 0000000..82e4eaf
--- /dev/null
+++ b/products/patches/catalyst-2.0.p001.patch
@@ -0,0 +1,12 @@
+diff -Naur catalyst_ref/src/tools/replay/catalyst_replay.cpp catalyst_dev/src/tools/replay/catalyst_replay.cpp
+--- catalyst_ref/src/tools/replay/catalyst_replay.cpp  2023-05-10 12:13:43.241883976 +0200
++++ catalyst_dev/src/tools/replay/catalyst_replay.cpp  2023-05-10 12:10:35.335509460 +0200
+@@ -16,7 +16,7 @@
+ #include <regex>
+ #include <sstream>
+ #include <string>
+-
++#include <cstdint>
+ #include <cstdlib>
+ 
+ void replace_mpi_comm(conduit_cpp::Node& params, std::uint64_t communicator, int depth = 0)