libglib2: fix build when toolchain has no thread support
PATCH 1/2 libglib2: fix build when toolchain has no thread support
Fixes the build failure visible at
http://autobuild.buildroot.net/results/3d3/3d3f4f0044a4b58ce3d0a3449a5f012d953d59bb
--- ...ib2-0004-fix-build-when-no-thread-support.patch | 28 ++++++++++++++++++++++ package/libglib2/libglib2.mk | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch
package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch new file +28 -0
@@ -0,0 +1,28 @@ +Fix gio/gcancellable.c build when thread support is disabled + +Signed-off-by: "Samuel Martin" <[email protected]> +--- +--- 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);
package/libglib2/libglib2.mk +3 -0
@@ -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
Signature · 1 line
1.8.2.3
PATCH 2/2 aircrack-ng: fix statically linked build
Fixe the build failure visible at
http://autobuild.buildroot.net/results/2441d8b62323a00f32f2edb7cb781dda71ff7f68
--- package/aircrack-ng/aircrack-ng.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
package/aircrack-ng/aircrack-ng.mk +4 -1
@@ -20,9 +20,12 @@ else AIRCRACK_NG_MAKE_OPTS = sqlite=false endif +AIRCRACK_NG_LDFLAGS = -lz \ + $(if $(BR2_PREFER_STATIC_LIB),-ldl -lpthread) + define AIRCRACK_NG_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE1) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lz" \ + LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \ -C $(@D) $(AIRCRACK_NG_MAKE_OPTS) all endef
Signature · 1 line
1.8.2.3
PATCH 2/2 aircrack-ng: fix statically linked build
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Samuel> Fixe the build failure visible at
Samuel> http://autobuild.buildroot.net/results/2441d8b62323a00f32f2edb7cb781dda71ff7f68
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 libglib2: fix build when toolchain has no thread support
In reply to Samuel MartinQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Samuel" == Samuel Martin <[email protected]> writes:
Samuel> Fixes the build failure visible at
Samuel> http://autobuild.buildroot.net/results/3d3/3d3f4f0044a4b58ce3d0a3449a5f012d953d59bb
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard