From d257d6660ff863a50b96baf63d8c539bf90c5226 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Tue, 25 Oct 2022 07:52:15 +0200 Subject: [PATCH] libwebsockets: full variant provides OpenSSL For some time, it is not possible to install ttyd and mosquitto-ssl at the same time, so let's solve it that libwebsockets-full provides libwebsockets-openssl. This allows to install ttyd and mosquitto at the same time. Also, we need to add conflict, because we should not have installed libwebsockets-openssl and libwebsockets-full at the same time as they provides the same files. Signed-off-by: Josef Schlehofer (cherry picked from commit 77e682a11c53f4dcd0e76bdea5ee82de77eaacfe) --- libs/libwebsockets/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index fcafa90df1..434743c4a2 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -54,6 +54,7 @@ define Package/libwebsockets-openssl TITLE += (OpenSSL) DEPENDS += +libopenssl VARIANT:=openssl + CONFLICTS:=libwebsockets-full endef define Package/libwebsockets-mbedtls @@ -68,6 +69,7 @@ define Package/libwebsockets-full TITLE += (Full - OpenSSL, libuv, plugins, CGI) DEPENDS += +libopenssl +libuv VARIANT:=full + PROVIDES:=libwebsockets-openssl endef ifeq ($(BUILD_VARIANT),openssl) -- 2.30.2