summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Schlehofer <pepe.schlehofer@gmail.com>2022-10-25 07:52:15 +0200
committerJosef Schlehofer <pepe.schlehofer@gmail.com>2022-10-25 14:29:44 +0200
commit13a3a415a9e9a8f75cafe6665e50254e23047d3c (patch)
tree21a87b1239d38b5da7a5ba17a7d3e367d066a83c
parent1eeac014adbb067bf8d70da5f9451dc68e2112e7 (diff)
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 <pepe.schlehofer@gmail.com> (cherry picked from commit 77e682a11c53f4dcd0e76bdea5ee82de77eaacfe)
-rw-r--r--libs/libwebsockets/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 7a180e3a3..9caedca68 100644
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -51,6 +51,7 @@ define Package/libwebsockets-openssl
TITLE += (OpenSSL)
DEPENDS += +libopenssl
VARIANT:=openssl
+ CONFLICTS:=libwebsockets-full
endef
define Package/libwebsockets-mbedtls
@@ -65,6 +66,7 @@ define Package/libwebsockets-full
TITLE += (Full - OpenSSL, libuv, plugins, CGI)
DEPENDS += +libopenssl +libuv
VARIANT:=full
+ PROVIDES:=libwebsockets-openssl
endef
ifeq ($(BUILD_VARIANT),openssl)