Skip to content

Commit abcfe0c

Browse files
gpaulsengpaulsen
authored
Merge pull request #9825 from bwbarrett/backports/v5.0.x-build-system-backports
Backport patches to re-enable tracking the PMIx 4.1 and PRRTE 2.0 branches
2 parents 2faa44d + 2a87b74 commit abcfe0c

File tree

7 files changed

+36
-31
lines changed

7 files changed

+36
-31
lines changed

‎3rd-party/openpmix

Submodule openpmix updated 120 files

‎3rd-party/prrte

Submodule prrte updated 130 files

‎config/ompi_setup_prrte.m4

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
147147
148148
internal_prrte_CPPFLAGS=
149149
internal_prrte_args="--with-proxy-version-string=$OPAL_VERSION --with-proxy-package-name=\"Open MPI\" --with-proxy-bugreport=\"https://www.open-mpi.org/community/help/\""
150-
internal_prrte_libs=
151150
152151
# Set --enable-prte-prefix-by-default to the deprecated options,
153152
# if they were specified. Otherwise, set it to enabled if the
@@ -159,19 +158,19 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
159158
[internal_prrte_args="$internal_prrte_args --enable-prte-prefix-by-default"])
160159
161160
AS_IF([test "$opal_libevent_mode" = "internal"],
162-
[internal_prrte_args="$internal_prrte_args --with-libevent-header=$opal_libevent_header"
163-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"
164-
internal_prrte_libs="$internal_prrte_libs $opal_libevent_LIBS"])
161+
[internal_prrte_args="$internal_prrte_args --with-libevent --disable-libevent-lib-checks"
162+
internal_prrte_args="$internal_prrte_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
163+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_libevent_CPPFLAGS"])
165164
166165
AS_IF([test "$opal_hwloc_mode" = "internal"],
167-
[internal_prrte_args="$internal_prrte_args --with-hwloc-header=$opal_hwloc_header"
168-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"
169-
internal_prrte_libs="$internal_prrte_libs $opal_hwloc_LIBS"])
166+
[internal_prrte_args="$internal_prrte_args --disable-hwloc-lib-checks"
167+
internal_prrte_args="$internal_prrte_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
168+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_hwloc_CPPFLAGS"])
170169
171170
AS_IF([test "$opal_pmix_mode" = "internal"],
172-
[internal_prrte_args="$internal_prrte_args --with-pmix-header=$opal_pmix_header"
173-
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"
174-
internal_prrte_libs="$internal_prrte_libs $opal_pmix_LIBS"])
171+
[internal_prrte_args="$internal_prrte_args --disable-pmix-lib-checks"
172+
internal_prrte_args="$internal_prrte_args --with-pmix-extra-libs=\"$opal_pmix_LIBS\""
173+
internal_prrte_CPPFLAGS="$internal_prrte_CPPFLAGS $opal_pmix_CPPFLAGS"])
175174
176175
AC_MSG_CHECKING([if PMIx version is 4.0.0 or greater])
177176
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pmix_version.h>]],
@@ -190,8 +189,6 @@ AC_DEFUN([_OMPI_SETUP_PRRTE_INTERNAL], [
190189
AC_MSG_WARN([--without-prrte option.])
191190
AC_MSG_ERROR([Cannot continue])])
192191
193-
# add the extra libs
194-
internal_prrte_args="$internal_prrte_args --with-prte-extra-lib=\"$internal_prrte_libs\" --with-prte-extra-ltlib=\"$internal_prrte_libs\""
195192
AS_IF([test "$with_ft" != "no"],
196193
[internal_prrte_args="--enable-prte-ft $internal_prrte_args"],
197194
[])

‎config/opal_config_hwloc.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ AC_DEFUN([OPAL_CONFIG_HWLOC], [
9292
[opal_hwloc_WRAPPER_LDFLAGS="$pkg_config_ldflags"
9393
opal_hwloc_WRAPPER_LIBS="$pkg_config_libs"],
9494
[# guess that what we have from compiling OMPI is good enough
95-
opal_hwloc_WRAPPER_LDFLAGS="$opal_hwloc_LDFLAGS"
96-
opal_hwloc_WRAPPER_LIBS="$opal_hwloc_LIBS"])
95+
AS_IF([test -z "$opal_hwloc_WRAPPER_LDFLAGS"],
96+
[opal_hwloc_WRAPPER_LDFLAGS="$opal_hwloc_LDFLAGS"])
97+
AS_IF([test -z "$opal_hwloc_WRAPPER_LIBS"],
98+
[opal_hwloc_WRAPPER_LIBS="$opal_hwloc_LIBS"])])
9799
98100
OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$opal_hwloc_WRAPPER_LDFLAGS])
99101
OPAL_WRAPPER_FLAGS_ADD([LIBS], [$opal_hwloc_WRAPPER_LIBS])
@@ -199,6 +201,7 @@ AC_DEFUN([_OPAL_CONFIG_HWLOC_INTERNAL], [
199201
# our tree and in the mean time are referenced by their .la
200202
# files.
201203
opal_hwloc_LIBS="$OMPI_TOP_BUILDDIR/$internal_hwloc_location/hwloc/libhwloc.la"
204+
opal_hwloc_WRAPPER_LIBS="-lhwloc"
202205
203206
opal_hwloc_header="$OMPI_TOP_BUILDDIR/$internal_hwloc_location/include/hwloc.h"
204207

‎config/opal_config_libevent.m4

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ AC_DEFUN([OPAL_CONFIG_LIBEVENT], [
103103
opal_libevent_WRAPPER_LIBS="$pkg_config_pthreads_libs"
104104
OPAL_FLAGS_APPEND_MOVE([opal_libevent_WRAPPER_LIBS], [$pkg_config_core_libs])],
105105
[# guess that what we have from compiling OMPI is good enough
106-
opal_libevent_WRAPPER_LDFLAGS="$opal_libevent_LDFLAGS"
107-
opal_libevent_WRAPPER_LIBS="$opal_libevent_LIBS"])
106+
AS_IF([test -z "$opal_libevent_WRAPPER_LDFLAGS"],
107+
[opal_libevent_WRAPPER_LDFLAGS="$opal_libevent_LDFLAGS"])
108+
AS_IF([test -z "$opal_libevent_WRAPPER_LIBS"],
109+
[opal_libevent_WRAPPER_LIBS="$opal_libevent_LIBS"])])
108110
109111
OPAL_WRAPPER_FLAGS_ADD([LDFLAGS], [$opal_libevent_WRAPPER_LDFLAGS])
110112
OPAL_WRAPPER_FLAGS_ADD([LIBS], [$opal_libevent_WRAPPER_LIBS])
@@ -239,6 +241,7 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_INTERNAL], [
239241
# our tree and in the mean time are referenced by their .la
240242
# files.
241243
opal_libevent_LIBS="$OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_core.la $OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_pthreads.la"
244+
opal_libevent_WRAPPER_LIBS="-levent_core -levent_pthreads"
242245
243246
opal_libevent_header="$OMPI_TOP_BUILDDIR/$internal_libevent_location/event.h"
244247

‎config/opal_config_pmix.m4

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dnl application when opal is built as a static library.
6464
dnl * CPPFLAGS, LDFLAGS - Updated opal_pmix_CPPFLAGS and
6565
dnl opal_pmix_LDFLAGS.
6666
AC_DEFUN([OPAL_CONFIG_PMIX], [
67-
OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_libs internal_pmix_CPPFLAGS])
67+
OPAL_VAR_SCOPE_PUSH([external_pmix_happy internal_pmix_happy internal_pmix_args internal_pmix_wrapper_libs internal_pmix_CPPFLAGS])
6868
6969
opal_show_subtitle "Configuring PMIx"
7070
@@ -87,21 +87,20 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
8787
# desired.
8888
8989
internal_pmix_args="--without-tests-examples --enable-pmix-binaries --disable-pmix-backward-compatibility --disable-visibility"
90-
internal_pmix_libs=
90+
internal_pmix_wrapper_libs=
9191
internal_pmix_CPPFLAGS=
9292
9393
AS_IF([test "$opal_libevent_mode" = "internal"],
94-
[internal_pmix_args="$internal_pmix_args --with-libevent=cobuild"
95-
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"
96-
internal_pmix_libs="$internal_pmix_libs $opal_libevent_LIBS"])
94+
[internal_pmix_args="$internal_pmix_args --with-libevent --disable-libevent-lib-checks"
95+
internal_pmix_args="$internal_pmix_args --with-libevent-extra-libs=\"$opal_libevent_LIBS\""
96+
internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_libevent_WRAPPER_LIBS\""
97+
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_libevent_CPPFLAGS"])
9798
9899
AS_IF([test "$opal_hwloc_mode" = "internal"],
99-
[internal_pmix_args="$internal_pmix_args --with-hwloc=cobuild"
100-
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"
101-
internal_pmix_libs="$internal_pmix_libs $opal_hwloc_LIBS"])
102-
103-
AS_IF([test ! -z "$internal_pmix_libs"],
104-
[internal_pmix_args="$internal_pmix_args --with-pmix-extra-lib=\"$internal_pmix_libs\""])
100+
[internal_pmix_args="$internal_pmix_args --disable-hwloc-lib-checks"
101+
internal_pmix_args="$internal_pmix_args --with-hwloc-extra-libs=\"$opal_hwloc_LIBS\""
102+
internal_pmix_wrapper_libs="$internal_pmix_wrapper_libs \"$opal_hwloc_WRAPPER_LIBS\""
103+
internal_pmix_CPPFLAGS="$internal_pmix_CPPFLAGS $opal_hwloc_CPPFLAGS"])
105104
106105
if test "$WANT_DEBUG" = "1"; then
107106
internal_pmix_args="$internal_pmix_args --enable-debug"
@@ -114,6 +113,8 @@ AC_DEFUN([OPAL_CONFIG_PMIX], [
114113
OPAL_SUBDIR_ENV_CLEAN([opal_pmix_configure])
115114
AS_IF([test -n "$internal_pmix_CPPFLAGS"],
116115
[OPAL_SUBDIR_ENV_APPEND([CPPFLAGS], [$internal_pmix_CPPFLAGS])])
116+
AS_IF([test -n "$internal_pmix_wrapper_libs"],
117+
[inernal_pmix_args="$internal_pmix_args --with-wrapper-libs=\"$internal_pmix_wrapper_libs\""])
117118
PAC_CONFIG_SUBDIR_ARGS([3rd-party/openpmix], [$internal_pmix_args],
118119
[[--with-libevent=internal], [--with-hwloc=internal],
119120
[--with-libevent=external], [--with-hwloc=external],

‎config/opal_functions.m4

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,9 @@ AC_DEFUN([OPAL_FLAGS_APPEND_MOVE], [
515515
AS_IF([test "x$val" != "x$arg"],
516516
[OPAL_APPEND([opal_tmp_variable], [$val])])
517517
done
518-
OPAL_APPEND([opal_tmp_variable], [$arg])])
519-
$1="$opal_tmp_variable"
518+
OPAL_APPEND([opal_tmp_variable], [$arg])
519+
$1="$opal_tmp_variable"],
520+
[OPAL_APPEND([$1], [$arg])])
520521
done
521522

522523
OPAL_VAR_SCOPE_POP

0 commit comments

Comments
 (0)