From a8803118bbaa5660a7cd9dd83551ac4ea2821394 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 10 May 2023 12:20:34 +0200 Subject: [PATCH] FD38: catalyst: add extra gcc include (cstdint) --- applications/SALOME-master-native.pyconf | 3 ++- products/catalyst.pyconf | 6 ++++++ products/patches/catalyst-2.0.p001.patch | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 products/patches/catalyst-2.0.p001.patch diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index b3ee309..2bdadee 100644 --- 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 08bd421..2af498d 100644 --- 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 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 + #include + #include +- ++#include + #include + + void replace_mpi_comm(conduit_cpp::Node& params, std::uint64_t communicator, int depth = 0) -- 2.39.2