xyce: patch issue affecting MPICH

var/spack/repos/builtin/packages/hpctoolkit/package.py

@@ -166,14 +166,14 @@ class Hpctoolkit(AutotoolsPackage):
 
     patch(
         "https://gitlab.com/hpctoolkit/hpctoolkit/-/commit/511afd95b01d743edc5940c84e0079f462b2c23e.patch",
-        sha256="8da18df88a80847c092da8d0892de51ea2bf2523124148b6305ab8717707d897",
+        sha256="c8371b929f45dafae37d2ef17880fcfb86de893beebaec501a282bc04b61ef64",
         when="@2019.08.01:2021.03 %gcc@11.0:",
     )
 
     # Update configure for rocm 5.3.0
     patch(
         "https://gitlab.com/hpctoolkit/hpctoolkit/-/commit/411d62544717873432c49ef45c7cb99cc5de2fb8.patch",
-        sha256="484045891a665cdba3b0f141540c89f0d691ed32c5912ef62a93670d44c2786c",
+        sha256="7eb3a21c9bf9e1b65ef0375609665d36e5f7a74c664eb474cba728faada9baeb",
         when="@2022.04:2022.10 +rocm ^hip@5.3.0:",
     )
 

var/spack/repos/builtin/packages/xyce/450-mpich-xyce.patch

@@ -0,0 +1,34 @@
+From 8a622dd8204754733c769f0d13b685419e6607db Mon Sep 17 00:00:00 2001
+From: Paul Kuberry <pakuber@sandia.gov>
+Date: Wed, 12 Apr 2023 13:36:28 -0600
+Subject: [PATCH] Remove use of OpenMPI specific struct member
+
+MPITest/testBUG967 could not be built with MPICH because it used
+OpenMPI specific struct member variable `_ucount`.
+
+Replaced use of `_ucount` with call to MPI_Get_count, which is
+compatible with OpenMPI and MPICH.
+---
+ src/test/MPITest/testBUG967.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/MPITest/testBUG967.c b/src/test/MPITest/testBUG967.c
+index cdf7f918f..26e1b5311 100644
+--- a/src/test/MPITest/testBUG967.c
++++ b/src/test/MPITest/testBUG967.c
+@@ -45,8 +45,10 @@ int main(int narg, char**arg)
+   for (i=0; i < nrecvs; i++){
+     MPI_Wait(req + i, &status);
+     procs_from[i] = status.MPI_SOURCE;
+-    printf("%d wait source %d count %lu \n",
+-           my_proc, status.MPI_SOURCE, status._ucount);
++    int count;
++    MPI_Get_count(&status, MPI_INT, &count);
++    printf("%d wait source %d count %d \n",
++           my_proc, status.MPI_SOURCE, count);
+   }
+ 
+   for (i = 0; i < nrecvs; i++)
+-- 
+2.37.1 (Apple Git-137.1)
+

var/spack/repos/builtin/packages/xyce/package.py

@@ -128,6 +128,14 @@ class Xyce(CMakePackage):
         # HDF5
         depends_on("hdf5~shared", when="^hdf5")
 
+    # fix MPI issue
+    patch(
+        "450-mpich-xyce.patch",
+        sha256="e91063d22afeeff01e6c572cef2ac2e3abea27b2fcb5a7e6ac5f41e4734a556d",
+        when="@:7.6,master",
+    )
+
+    # fix RPATH issue on mac
     patch(
         "https://github.com/xyce/xyce/commit/40dbc0e0341a5cf9a7fa82a87313869dc284fdd9.patch?full_index=1",
         sha256="3c32faeeea0bb29be44ec20e414670c9fd375f9ed921a7f6e9fd3de02c28859d",