diff --git a/3rd-party/openpmix b/3rd-party/openpmix index f20e0d5dc6b..f8f578392ec 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit f20e0d5dc6b4028bd1edd469980c5f6ff71014ad +Subproject commit f8f578392ec77dd7a1d76ca697da4f15afcb0161 diff --git a/3rd-party/prrte b/3rd-party/prrte index 63370ca0077..bb4085053a0 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 63370ca00771a7a6004d6b638476ca794b04e4c1 +Subproject commit bb4085053a0b268ae2a2e04ed56387f53e4a3e7a diff --git a/autogen.pl b/autogen.pl index 2059e9c2902..4fcb2abcc07 100755 --- a/autogen.pl +++ b/autogen.pl @@ -1625,10 +1625,6 @@ sub replace_config_sub_guess { if (! -f "3rd-party/prrte/configure.ac") { my_die("Could not find pmix files\n"); } - - verbose "Patching prrte.spec file\n"; - system("$patch_prog -N -p0 < ./config/prrte.spec.diff > /dev/null 2>&1"); - push(@subdirs, "3rd-party/prrte/"); $m4 .= "m4_define([package_prrte], [1])\n"; diff --git a/config/prrte.spec.diff b/config/prrte.spec.diff deleted file mode 100644 index 4e8b1a86eb1..00000000000 --- a/config/prrte.spec.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 3rd-party/prrte/contrib/dist/linux/prrte.spec 2023-10-03 08:12:43.842625000 -0400 -+++ 3rd-party/prrte/contrib/dist/linux/prrte.spec 2023-10-03 08:12:27.849686000 -0400 -@@ -612,7 +612,7 @@ - %{shell_scripts_path}/%{shell_scripts_basename}.sh - %{shell_scripts_path}/%{shell_scripts_basename}.csh - %endif --%doc README INSTALL LICENSE -+%doc README.md LICENSE - - %else - -@@ -656,7 +656,7 @@ - %{shell_scripts_path}/%{shell_scripts_basename}.sh - %{shell_scripts_path}/%{shell_scripts_basename}.csh - %endif --%doc README INSTALL LICENSE -+%doc README.md LICENSE - %{_pkgdatadir} - - %files devel -f devel.files