Use sigwaitinfo() function only if available.

Resolves yet another deficiency of Bionic C library.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/configure.ac b/configure.ac
index 5dcb8b38f980ec8505d20fbae13485721ffa1a27..ede98b1ad2dd27a3671d2ef365c86e5030e15d0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -321,7 +321,7 @@ AC_C_INLINE
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 if test -z "${CONFIG_ORTE_RT}" ; then
-AC_CHECK_FUNCS([gethostbyname getopt_long])
+AC_CHECK_FUNCS([gethostbyname getopt_long sigwaitinfo])
 fi
 
 AC_CONFIG_FILES([Makefile

diff --git a/orte/manager/ortemanager.c b/orte/manager/ortemanager.c
index fa88433985d006aeb35137d2d7b4058bdef0ada1..910df3b9fc1c19cfd4cd958af76108f195b3e3eb 100644 (file)
--- a/orte/manager/ortemanager.c
+++ b/orte/manager/ortemanager.c
@@ -91,7 +91,14 @@ void waitForEndingCommand(void) {
        sigemptyset(&sigset);
        sigaddset(&sigset, SIGINT);
        sigaddset(&sigset, SIGTERM);
-       sigwaitinfo(&sigset, NULL);
+       {
+       #ifdef HAVE_SIGWAITINFO
+               sigwaitinfo(&sigset, NULL);
+       #else /*HAVE_SIGWAITINFO*/
+               int sig;
+               sigwait(&sigset, &sig);
+       #endif /*HAVE_SIGWAITINFO*/
+       }
 }
 static int daemonInit(void) {
   pid_t pid;