Skip to contentSkip to conversation

package/libeXosip2: fix build without threads

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 25, 2020 – Mar 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/libeXosip2: fix build without threads

Fixes:
- http://autobuild.buildroot.org/results/ec262058cc0a4bf92c381857eaf3b44412942bba

---
Changes v1 -> v2 (after review of Gilles Talis)
- Use upstream patch

 ...pilation-error-introduced-with-epoll.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch
package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch new file +44 -0
new file mode 100644
index 0000000000..b69455bd7a
@@ -0,0 +1,44 @@
+From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001
+From: Aymeric Moizard <[email protected]>
+Date: Fri, 13 Mar 2020 16:34:41 +0100
+Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll
+ implementation
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f]
+---
+ src/eXconf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/eXconf.c b/src/eXconf.c
+index baf90be..6165eb3 100644
+--- a/src/eXconf.c
++++ b/src/eXconf.c
+@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext)
+   }
+ 
+   if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) {
++#ifndef OSIP_MONOTHREAD
+     struct epoll_event ev;
++#endif
+     excontext->epfdctl = epoll_create (1);
+     if (excontext->epfdctl < 0) {
+       return OSIP_UNDEFINED_ERROR;
+     }
+     
++#ifndef OSIP_MONOTHREAD
+     memset(&ev, 0, sizeof(struct epoll_event));
+     ev.events = EPOLLIN;
+     ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event);
+@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext)
+       _eXosip_closesocket (excontext->epfdctl);
+       return OSIP_UNDEFINED_ERROR;
+     }
++#endif
+   }
+ #endif
+   
+-- 
+cgit v1.2.1
+
Signature · 1 line
2.25.1
#1 lore raw

PATCH v2 1/1 package/libeXosip2: fix build without threads

Hello Fabrice, all,

Le mer. 25 mars 2020 ? 08:35, Fabrice Fontaine
<[email protected]> a ?crit :

Quoted 64 lines

Fixes:
- http://autobuild.buildroot.org/results/ec262058cc0a4bf92c381857eaf3b44412942bba

---
Changes v1 -> v2 (after review of Gilles Talis)
- Use upstream patch

 ...pilation-error-introduced-with-epoll.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch
package/libeXosip2/0001-fix-fix-OSIP_MONOTHREAD-compilation-error-introduced-with-epoll.patch new file +44 -1
new file mode 100644
index 0000000000..b69455bd7a
@@ -0,0 +1,44 @@
+From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001
+From: Aymeric Moizard <[email protected]>
+Date: Fri, 13 Mar 2020 16:34:41 +0100
+Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll
+ implementation
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f]
+---
+ src/eXconf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/eXconf.c b/src/eXconf.c
+index baf90be..6165eb3 100644
+--- a/src/eXconf.c
++++ b/src/eXconf.c
+@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext)
+   }
+
+   if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) {
++#ifndef OSIP_MONOTHREAD
+     struct epoll_event ev;
++#endif
+     excontext->epfdctl = epoll_create (1);
+     if (excontext->epfdctl < 0) {
+       return OSIP_UNDEFINED_ERROR;
+     }
+
++#ifndef OSIP_MONOTHREAD
+     memset(&ev, 0, sizeof(struct epoll_event));
+     ev.events = EPOLLIN;
+     ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event);
+@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext)
+       _eXosip_closesocket (excontext->epfdctl);
+       return OSIP_UNDEFINED_ERROR;
+     }
++#endif
+   }
+ #endif
+
+--
+cgit v1.2.1
+
--
Quoted 2 lines

2.25.1

Thanks for updating the patch!