mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 14:46:31 +00:00
libglib2: fix build when toolchain has no thread support
Fixes the build failure visible at http://autobuild.buildroot.net/results/3d3/3d3f4f0044a4b58ce3d0a3449a5f012d953d59bb Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
parent
bed1490d0f
commit
cf81029c01
@ -0,0 +1,28 @@
|
|||||||
|
Fix gio/gcancellable.c build when thread support is disabled
|
||||||
|
|
||||||
|
Signed-off-by: "Samuel Martin" <s.martin49@gmail.com>
|
||||||
|
---
|
||||||
|
--- a/gio/gcancellable.c 2013-05-14 23:08:25.514461348 +0200
|
||||||
|
+++ b/gio/gcancellable.c 2013-05-14 23:10:23.347789625 +0200
|
||||||
|
@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance
|
||||||
|
while (priv->cancelled_running)
|
||||||
|
{
|
||||||
|
priv->cancelled_running_waiting = TRUE;
|
||||||
|
+#if defined(G_THREADS_ENABLED)
|
||||||
|
g_cond_wait (cancellable_cond,
|
||||||
|
g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv->cancelled)
|
||||||
|
@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable
|
||||||
|
while (priv->cancelled_running)
|
||||||
|
{
|
||||||
|
priv->cancelled_running_waiting = TRUE;
|
||||||
|
+#if defined(G_THREADS_ENABLED)
|
||||||
|
g_cond_wait (cancellable_cond,
|
||||||
|
g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable)));
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
g_signal_handler_disconnect (cancellable, handler_id);
|
@ -67,6 +67,9 @@ HOST_LIBGLIB2_CONF_OPT = \
|
|||||||
--disable-tests
|
--disable-tests
|
||||||
|
|
||||||
LIBGLIB2_CONF_OPT += --disable-tests
|
LIBGLIB2_CONF_OPT += --disable-tests
|
||||||
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
|
||||||
|
LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads
|
||||||
|
endif
|
||||||
|
|
||||||
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
|
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user