gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libglib2: fix build when toolchain has no thread support

Browse Source 
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:
Samuel Martin 2013-05-14 22:26:49 +00:00 committed by Peter Korsgaard
parent bed1490d0f
commit cf81029c01
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch Normal file
View File

@ -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);

3
package/libglib2/libglib2.mk
View File

@ -67,6 +67,9 @@ HOST_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