diff --git a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-24.11.eb b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-24.11.eb index dc5d6452..193a35ec 100644 --- a/o/OpenMPI/OpenMPI-4.1.6-NVHPC-24.11.eb +++ b/o/OpenMPI/OpenMPI-4.1.6-NVHPC-24.11.eb @@ -23,7 +23,7 @@ checksums = [ # OpenMPI-4.1.1_opal-datatype-cuda-performance.patch 'b767c7166cf0b32906132d58de5439c735193c9fd09ec3c5c11db8d5fa68750e', # OpenMPI-4.1.6_disable_opal_path_nfs_test.patch - 'f9647cef5b3e0469573bc93936655acfc9a2a925c813108115e0b38264e1114d', + 'ba2d66ce90499da9de8173de3a6ce7e5f7472741a4d9c1e0d0149cb1d3d147ff', ] builddependencies = [ diff --git a/o/OpenMPI/OpenMPI-4.1.6_disable_opal_path_nfs_test.patch b/o/OpenMPI/OpenMPI-4.1.6_disable_opal_path_nfs_test.patch index 73c2dc47..d21417ef 100644 --- a/o/OpenMPI/OpenMPI-4.1.6_disable_opal_path_nfs_test.patch +++ b/o/OpenMPI/OpenMPI-4.1.6_disable_opal_path_nfs_test.patch @@ -1,18 +1,18 @@ diff -ruN openmpi-4.1.6.orig/test/util/Makefile.am openmpi-4.1.6/test/util/Makefile.am ---- openmpi-4.1.6.orig/test/util/Makefile.am 2023-09-30 17:23:17.000000000 +0200 -+++ openmpi-4.1.6/test/util/Makefile.am 2024-12-12 15:31:51.665278259 +0100 +--- openmpi-4.1.6.orig/test/util/Makefile.am 2023-09-30 17:23:17.000000000 +0200 ++++ openmpi-4.1.6/test/util/Makefile.am 2024-12-12 15:31:51.665278259 +0100 @@ -38,7 +38,6 @@ - + check_PROGRAMS = \ - opal_bit_ops \ -- opal_path_nfs \ - bipartite_graph - + opal_bit_ops \ +- opal_path_nfs \ + bipartite_graph + TESTS = \ @@ -79,11 +78,11 @@ $(top_builddir)/test/support/libsupport.a opal_bit_ops_DEPENDENCIES = $(opal_path_nfs_LDADD) - + -opal_path_nfs_SOURCES = opal_path_nfs.c -opal_path_nfs_LDADD = \ - $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ @@ -23,6 +23,6 @@ diff -ruN openmpi-4.1.6.orig/test/util/Makefile.am openmpi-4.1.6/test/util/Makef +# $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ +# $(top_builddir)/test/support/libsupport.a +#opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD) - + #opal_os_path_SOURCES = opal_os_path.c #opal_os_path_LDADD = \ diff --git a/o/OpenMPI/example.patch b/o/OpenMPI/example.patch deleted file mode 100644 index d21417ef..00000000 --- a/o/OpenMPI/example.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ruN openmpi-4.1.6.orig/test/util/Makefile.am openmpi-4.1.6/test/util/Makefile.am ---- openmpi-4.1.6.orig/test/util/Makefile.am 2023-09-30 17:23:17.000000000 +0200 -+++ openmpi-4.1.6/test/util/Makefile.am 2024-12-12 15:31:51.665278259 +0100 -@@ -38,7 +38,6 @@ - - check_PROGRAMS = \ - opal_bit_ops \ -- opal_path_nfs \ - bipartite_graph - - TESTS = \ -@@ -79,11 +78,11 @@ - $(top_builddir)/test/support/libsupport.a - opal_bit_ops_DEPENDENCIES = $(opal_path_nfs_LDADD) - --opal_path_nfs_SOURCES = opal_path_nfs.c --opal_path_nfs_LDADD = \ -- $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ -- $(top_builddir)/test/support/libsupport.a --opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD) -+#opal_path_nfs_SOURCES = opal_path_nfs.c -+#opal_path_nfs_LDADD = \ -+# $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \ -+# $(top_builddir)/test/support/libsupport.a -+#opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD) - - #opal_os_path_SOURCES = opal_os_path.c - #opal_os_path_LDADD = \