From: Jörg Krause Date: Wed, 30 Mar 2016 20:22:37 +0000 (+0200) Subject: libwebsockets: fix build with nothread toolchains X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44dcf3ec02b5127378fc6569cfa69d251c2973e7;p=buildroot.git libwebsockets: fix build with nothread toolchains >From upstream changelog: > If LWS_MAX_SMP=1, then there is no code related to pthreads compiled in the library. If more than 1, a small amount of pthread mutex code is built into the library. Set LWS_MAX_SMP=1 for toolchains without thread support, otherwise leave it unset so upstreams CMakeLists.txt will take care of it. Fixes: http://autobuild.buildroot.net/results/dbf/dbf45a52b9aef602fd62ad1ca10957bafe656923/ http://autobuild.buildroot.net/results/26c/26c2ac28f44f8f1b227caa715af60bcd92a5f740/ http://autobuild.buildroot.net/results/d65/d65dcbfb96b249e01b034c01a52884b522c778b3/ http://autobuild.buildroot.net/results/e55/e550ebfdd1e8f459ca7b12f2708a704eaec52474/ .. and more. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 395a2edcd9..8d3663fe90 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -13,6 +13,15 @@ LIBWEBSOCKETS_INSTALL_STAGING = YES LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/9eec5e4470397632af035c429295a41b74bd0585.patch +# If LWS_MAX_SMP=1, then there is no code related to pthreads compiled +# in the library. If unset, LWS_MAX_SMP defaults to 32 and a small +# amount of pthread mutex code is built into the library. +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP=1 +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP= +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON