libwebsockets: fix recursive dependency
While running `make menuconfig`, it was discovered then there is a
recursive dependency like this:
tmp/.config-package.in:59138:error: recursive dependency detected!
tmp/.config-package.in:59138: symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls
tmp/.config-package.in:59122: symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl
It is not possible with the recently added conflicts that two packages
(OpenSSL and full variant, which uses OpenSSL as well), which are almost the same
provides the same named package libwebsockets as their conflict - Mbed
TLS.
Fixes: 676c5c72b5
("libwebsockets: OpenSSL
and mbedTLS variants should conflict")
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
parent
61d1a86ec3
commit
a4e8cbb89a
1 changed files with 2 additions and 2 deletions
|
@ -48,7 +48,6 @@ define Package/libwebsockets/Default
|
|||
DEPENDS:=+zlib +libcap
|
||||
URL:=https://libwebsockets.org
|
||||
MAINTAINER:=Karl Palsson <karlp@etactica.com>
|
||||
PROVIDES:= libwebsockets
|
||||
endef
|
||||
|
||||
define Package/libwebsockets-openssl
|
||||
|
@ -64,6 +63,7 @@ define Package/libwebsockets-mbedtls
|
|||
TITLE += (mbedTLS)
|
||||
DEPENDS += +libmbedtls
|
||||
VARIANT:=mbedtls
|
||||
PROVIDES:=libwebsockets
|
||||
CONFLICTS:=libwebsockets-openssl
|
||||
endef
|
||||
|
||||
|
@ -72,7 +72,7 @@ define Package/libwebsockets-full
|
|||
TITLE += (Full - OpenSSL, libuv, plugins, CGI)
|
||||
DEPENDS += +libopenssl +libuv
|
||||
VARIANT:=full
|
||||
PROVIDES:=libwebsockets-openssl
|
||||
PROVIDES:=libwebsockets libwebsockets-openssl
|
||||
endef
|
||||
|
||||
ifeq ($(BUILD_VARIANT),openssl)
|
||||
|
|
Loading…
Reference in a new issue