Skip to content

Commit

Permalink
libwebsockets: fix recursive dependency
Browse files Browse the repository at this point in the history
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: 676c5c7 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <[email protected]>
(cherry picked from commit a4e8cbb)
  • Loading branch information
BKPepe committed Oct 27, 2022
1 parent fefd89f commit b4d1b84
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libs/libwebsockets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ define Package/libwebsockets/Default
DEPENDS:=+zlib +libcap
URL:=https://libwebsockets.org
MAINTAINER:=Karl Palsson <[email protected]>
PROVIDES:= libwebsockets
endef

define Package/libwebsockets-openssl
Expand All @@ -64,6 +63,7 @@ define Package/libwebsockets-mbedtls
TITLE += (mbedTLS)
DEPENDS += +libmbedtls
VARIANT:=mbedtls
PROVIDES:=libwebsockets
CONFLICTS:=libwebsockets-openssl
endef

Expand All @@ -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)
Expand Down

0 comments on commit b4d1b84

Please sign in to comment.