Some more libevent configure fixes. Ensure -levent gets added to the wrapper flags as the LANL machines can't seem to find it otherwise. Remove the duplicate evaluation of --visibility in the libevent area as it was already done by opal for everyone. Set some more ignores.
This commit was SVN r26485.
Этот коммит содержится в:
родитель
31beff6362
Коммит
1d41c6bb80
@ -33,7 +33,7 @@ AC_DEFUN([MCA_opal_event_libevent2019_CONFIG],[
|
|||||||
CPPFLAGS="-I$OMPI_TOP_SRCDIR -I$OMPI_TOP_BUILDDIR -I$OMPI_TOP_SRCDIR/opal/include $CPPFLAGS"
|
CPPFLAGS="-I$OMPI_TOP_SRCDIR -I$OMPI_TOP_BUILDDIR -I$OMPI_TOP_SRCDIR/opal/include $CPPFLAGS"
|
||||||
|
|
||||||
AC_MSG_CHECKING([libevent configuration args])
|
AC_MSG_CHECKING([libevent configuration args])
|
||||||
event_args="--disable-dns --disable-http --disable-rpc --disable-openssl --enable-hidden-symbols"
|
event_args="--disable-dns --disable-http --disable-rpc --disable-openssl"
|
||||||
|
|
||||||
AC_ARG_ENABLE(event-rtsig,
|
AC_ARG_ENABLE(event-rtsig,
|
||||||
AC_HELP_STRING([--enable-event-rtsig],
|
AC_HELP_STRING([--enable-event-rtsig],
|
||||||
@ -176,6 +176,7 @@ EOF
|
|||||||
# compilers (in the --with-devel-headers case).
|
# compilers (in the --with-devel-headers case).
|
||||||
file=$basedir/libevent
|
file=$basedir/libevent
|
||||||
opal_event_libevent2019_ADD_CPPFLAGS="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
opal_event_libevent2019_ADD_CPPFLAGS="-I$OMPI_TOP_SRCDIR/$file -I$OMPI_TOP_SRCDIR/$file/include"
|
||||||
|
opal_event_libevent2019_ADD_WRAPPER_EXTRA_LDFLAGS="-levent"
|
||||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||||
[opal_event_libevent2019_ADD_CPPFLAGS="$opal_event_libevent2019_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
[opal_event_libevent2019_ADD_CPPFLAGS="$opal_event_libevent2019_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||||
if test "$with_devel_headers" = "yes" ; then
|
if test "$with_devel_headers" = "yes" ; then
|
||||||
|
@ -368,9 +368,6 @@
|
|||||||
/* Numeric representation of the version */
|
/* Numeric representation of the version */
|
||||||
#undef NUMERIC_VERSION
|
#undef NUMERIC_VERSION
|
||||||
|
|
||||||
/* Whether C compiler supports symbol visibility or not */
|
|
||||||
#undef OPAL_C_HAVE_VISIBILITY
|
|
||||||
|
|
||||||
/* Name of package */
|
/* Name of package */
|
||||||
#undef PACKAGE
|
#undef PACKAGE
|
||||||
|
|
||||||
|
@ -141,10 +141,6 @@ AC_ARG_ENABLE([signal],
|
|||||||
[AS_HELP_STRING([--disable-signal], [disable signal support])],
|
[AS_HELP_STRING([--disable-signal], [disable signal support])],
|
||||||
[], [enable_signal=yes])
|
[], [enable_signal=yes])
|
||||||
|
|
||||||
AC_ARG_ENABLE([hidden-symbols],
|
|
||||||
[AS_HELP_STRING([--enable-hidden-symbols],
|
|
||||||
[Use linker "visibility" functionality to hide libevent symbols])],
|
|
||||||
[], [enable_hidden_symbols=no])
|
|
||||||
dnl ****** END Open MPI Changes ******
|
dnl ****** END Open MPI Changes ******
|
||||||
|
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
@ -424,12 +420,6 @@ fi
|
|||||||
|
|
||||||
AC_CHECK_SIZEOF(long)
|
AC_CHECK_SIZEOF(long)
|
||||||
|
|
||||||
dnl ****** Open MPI Changes ******
|
|
||||||
dnl See if we need to check and set visibility capabilities
|
|
||||||
AS_IF([test "$enable_hidden_symbols" = "yes"],
|
|
||||||
[OPAL_CHECK_VISIBILITY])
|
|
||||||
dnl ****** END Open MPI Changes ******
|
|
||||||
|
|
||||||
AC_MSG_CHECKING(for F_SETFD in fcntl.h)
|
AC_MSG_CHECKING(for F_SETFD in fcntl.h)
|
||||||
AC_EGREP_CPP(yes,
|
AC_EGREP_CPP(yes,
|
||||||
[
|
[
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user