From 91a5af83cdbf9b98a45bce8d262cead4d9f2f839 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 5 Nov 2020 07:54:22 -0800 Subject: [PATCH 1/3] config/Makefile.am: ensure getdate.sh is in dist tarball Signed-off-by: Jeff Squyres --- config/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/config/Makefile.am b/config/Makefile.am index fb3b4c7263..cf80f90f1b 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -29,6 +29,7 @@ EXTRA_DIST = \ ltmain_pgi_tp.diff \ opal_mca_priority_sort.pl \ find_common_syms \ + getdate.sh \ make_manpage.pl \ md2nroff.pl From a6a0d511f9e75499e215388311fa1b7895b7f1ba Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 5 Nov 2020 08:32:39 -0800 Subject: [PATCH 2/3] opal_functions.m4: add comment No code or logic changes. Add commit about why it's ok to use $srcdir here (vs. $OMPI_TOP_SRCDIR). Signed-off-by: Jeff Squyres --- config/opal_functions.m4 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/opal_functions.m4 b/config/opal_functions.m4 index 2a552ad74c..270add9b08 100644 --- a/config/opal_functions.m4 +++ b/config/opal_functions.m4 @@ -96,6 +96,12 @@ EOF OPAL_CONFIGURE_USER="${USER:-`whoami`}" OPAL_CONFIGURE_HOST="${HOSTNAME:-`(hostname || uname -n) 2> /dev/null | sed 1q`}" +# Note: it's ok to use $srcdir here because this macro is called at +# the very beginning of configure.ac: +# +# a) before $OMPI_TOP_SRCDIR is set, and +# b) from the top-level build directory (i.e., so $srcdir actually +# points to the top source directory) OPAL_CONFIGURE_DATE="`$srcdir/config/getdate.sh`" OPAL_LIBNL_SANITY_INIT From a784a8431f42ca3795baa633dee36dc5e9a4341d Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 5 Nov 2020 11:33:47 -0800 Subject: [PATCH 3/3] PRRTE / OpenPMIx: update git submodule pointers Update to the latest master HEAD for both PRRTE and OpenPMIx to fix some getdate.sh issues. Signed-off-by: Jeff Squyres --- 3rd-party/openpmix | 2 +- 3rd-party/prrte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rd-party/openpmix b/3rd-party/openpmix index c4fe45f982..9da252a5ec 160000 --- a/3rd-party/openpmix +++ b/3rd-party/openpmix @@ -1 +1 @@ -Subproject commit c4fe45f982b6cdf818f9d42d2bdf3a92019f92e4 +Subproject commit 9da252a5ecb5fddb45f93a5169e6e4ef3b7280ec diff --git a/3rd-party/prrte b/3rd-party/prrte index 8cc88dd7f7..ffdf6916eb 160000 --- a/3rd-party/prrte +++ b/3rd-party/prrte @@ -1 +1 @@ -Subproject commit 8cc88dd7f7627c2238b9b7bac2e68fe5a6092f7e +Subproject commit ffdf6916eb600d0b5e37ef6747c5384944db8625