diff --git a/package/libwebsockets/Config.in b/package/libwebsockets/Config.in index dff6688e83..d7b529cafd 100644 --- a/package/libwebsockets/Config.in +++ b/package/libwebsockets/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBWEBSOCKETS bool "libwebsockets" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ZLIB help Libwebsockets is a lightweight pure C library built to use @@ -7,3 +8,6 @@ config BR2_PACKAGE_LIBWEBSOCKETS in both directions. https://libwebsockets.org/ + +comment "libwebsockets needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 6f752f998e..c25686d385 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -69,10 +69,6 @@ else LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=OFF endif -ifeq ($(BR2_STATIC_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SHARED=OFF -endif - ifeq ($(BR2_SHARED_LIBS),y) LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF endif diff --git a/package/ttyd/Config.in b/package/ttyd/Config.in index df710fbac3..ecc705b17e 100644 --- a/package/ttyd/Config.in +++ b/package/ttyd/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_TTYD bool "ttyd" - depends on !BR2_STATIC_LIBS # libuv + depends on !BR2_STATIC_LIBS # libuv, libwebsockets depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv, json-c depends on BR2_USE_MMU # libuv