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: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a4e8cbb89a48729b3c3ad615765549628d495b0f)

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 76e6bf0635191489ec1f22cd4e8cf6f4cd396adc..05691eb3f850514f4be773321861d8aa32d1d498 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -46,7 +46,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
@@ -62,6 +61,7 @@ define Package/libwebsockets-mbedtls
        TITLE += (mbedTLS)
        DEPENDS += +libmbedtls
        VARIANT:=mbedtls
+       PROVIDES:=libwebsockets
        CONFLICTS:=libwebsockets-openssl
 endef
 
@@ -70,7 +70,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)