From 3ce0104b347b4c274ab23de88125f4b557ef9760 Mon Sep 17 00:00:00 2001 From: Joshua Hursey Date: Mon, 23 Jan 2017 13:39:33 -0600 Subject: [PATCH 1/2] libevent2022: Fix broken configure AC_LANG_PROGRAM * The AC_LANG_PROGRAM macro adds the `main()` so it is erroneous to add it to the test program. * This was detected with the XL compilers which will fail to build the program in this situation. The GNU compiler does not error out or warn, but successfully compiles the program. Signed-off-by: Joshua Hursey (cherry picked from commit 029964a748230475bc4c950334bd85d593e2352e) Signed-off-by: Joshua Hursey --- opal/mca/event/libevent2022/libevent/configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/opal/mca/event/libevent2022/libevent/configure.ac b/opal/mca/event/libevent2022/libevent/configure.ac index a13fee5895d..ac989afd4cb 100644 --- a/opal/mca/event/libevent2022/libevent/configure.ac +++ b/opal/mca/event/libevent2022/libevent/configure.ac @@ -610,8 +610,6 @@ if test "$enable_epoll" != "no" ; then AC_INCLUDES_DEFAULT #include ],[[ -int main(int argc, char **argv) -{ struct epoll_event epevin; struct epoll_event epevout; int res; @@ -639,7 +637,6 @@ int main(int argc, char **argv) } } /* SUCCESS */ -} ]])], [haveepoll=yes # OMPI: Don't use AC_LIBOBJ From d2630168a8dccb0f6c3517539faa0e76abee8937 Mon Sep 17 00:00:00 2001 From: Joshua Hursey Date: Mon, 23 Jan 2017 21:46:58 -0600 Subject: [PATCH 2/2] libevent2022: Fix broken configure AC_LANG_PROGRAM * Similar to commit https://github.com/open-mpi/ompi/commit/029964a748230475bc4c950334bd85d593e2352e This removes an extra `int main` during configure. Signed-off-by: Joshua Hursey (cherry picked from commit 72ac812039d1609f1315d632ff6b2fa192b573cb) Signed-off-by: Joshua Hursey --- opal/mca/event/libevent2022/libevent/configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/opal/mca/event/libevent2022/libevent/configure.ac b/opal/mca/event/libevent2022/libevent/configure.ac index ac989afd4cb..5dd85aff473 100644 --- a/opal/mca/event/libevent2022/libevent/configure.ac +++ b/opal/mca/event/libevent2022/libevent/configure.ac @@ -668,9 +668,6 @@ AC_INCLUDES_DEFAULT #include #include ],[[ -int -main(int argc, char **argv) -{ struct epoll_event epevin; struct epoll_event epevout; int res; @@ -699,7 +696,6 @@ main(int argc, char **argv) } } /* SUCCESS */ -} ]])], [haveepollsyscall=yes # OMPI: don't use AC_LIBOBJ