Skip to content

Commit bce435c

Browse files
committed
libevent: Link against libevent_core, not libevent
In the change to use 3rd-party packaging, a mistake was made and we started linking against the old-style libevent.* instead of the new-style libevent_core.*. This caused errors on OS X, where PMIx linked against libevent_core and OMPI linked against libevent. This patch changes the behavior back to linking against libevent_core. Signed-off-by: Brian Barrett <bbarrett@amazon.com>
1 parent 8bc5d4c commit bce435c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

config/opal_config_libevent.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_EXTERNAL], [
101101
102102
OPAL_CHECK_PACKAGE([opal_libevent],
103103
[event2/event.h],
104-
[event],
104+
[event_core],
105105
[event_config_new],
106106
[-levent_pthreads],
107107
[$with_libevent],
@@ -118,7 +118,7 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_EXTERNAL], [
118118
# "evthread_set_lock_callbacks", which will only exist if
119119
# libevent was configured with thread support.
120120
AS_IF([test "$opal_libevent_external_support" = "yes"],
121-
[AC_CHECK_LIB([event], [evthread_set_lock_callbacks],
121+
[AC_CHECK_LIB([event_core], [evthread_set_lock_callbacks],
122122
[],
123123
[AC_MSG_WARN([External libevent does not have thread support])
124124
AC_MSG_WARN([Open MPI requires libevent to be compiled with])
@@ -199,7 +199,7 @@ AC_DEFUN([_OPAL_CONFIG_LIBEVENT_INTERNAL], [
199199
# No need to update LDFLAGS, because they will install into
200200
# our tree and in the mean time are referenced by their .la
201201
# files.
202-
opal_libevent_LIBS="$OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent.la $OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_pthreads.la"
202+
opal_libevent_LIBS="$OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_core.la $OMPI_TOP_BUILDDIR/$internal_libevent_location/libevent_pthreads.la"
203203
204204
opal_libevent_header="$OMPI_TOP_BUILDDIR/$internal_libevent_location/event.h"
205205

0 commit comments

Comments
 (0)