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 77e682a11c
)
This commit is contained in:
parent
480833d673
commit
19cb57bf12
1 changed files with 2 additions and 0 deletions
|
@ -51,6 +51,7 @@ define Package/libwebsockets-openssl
|
||||||
TITLE += (OpenSSL)
|
TITLE += (OpenSSL)
|
||||||
DEPENDS += +libopenssl
|
DEPENDS += +libopenssl
|
||||||
VARIANT:=openssl
|
VARIANT:=openssl
|
||||||
|
CONFLICTS:=libwebsockets-full
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/libwebsockets-mbedtls
|
define Package/libwebsockets-mbedtls
|
||||||
|
@ -65,6 +66,7 @@ define Package/libwebsockets-full
|
||||||
TITLE += (Full - OpenSSL, libuv, plugins, CGI)
|
TITLE += (Full - OpenSSL, libuv, plugins, CGI)
|
||||||
DEPENDS += +libopenssl +libuv
|
DEPENDS += +libopenssl +libuv
|
||||||
VARIANT:=full
|
VARIANT:=full
|
||||||
|
PROVIDES:=libwebsockets-openssl
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifeq ($(BUILD_VARIANT),openssl)
|
ifeq ($(BUILD_VARIANT),openssl)
|
||||||
|
|
Loading…
Reference in a new issue