mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

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>
(cherry picked from commit a4e8cbb89a)
This commit is contained in:
Josef Schlehofer 2022-10-26 09:12:38 +02:00
parent 8542fd3f3c
commit 0171d18e05
No known key found for this signature in database
GPG Key ID: B950216FE4329F4C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/libwebsockets/Makefile
View File

@ -46,7 +46,6 @@ define Package/libwebsockets/Default
DEPENDS:=+zlib +libcap DEPENDS:=+zlib +libcap
URL:=https://libwebsockets.org URL:=https://libwebsockets.org
MAINTAINER:=Karl Palsson <karlp@etactica.com> MAINTAINER:=Karl Palsson <karlp@etactica.com>
PROVIDES:= libwebsockets
endef endef
define Package/libwebsockets-openssl define Package/libwebsockets-openssl
@ -62,6 +61,7 @@ define Package/libwebsockets-mbedtls
TITLE += (mbedTLS) TITLE += (mbedTLS)
DEPENDS += +libmbedtls DEPENDS += +libmbedtls
VARIANT:=mbedtls VARIANT:=mbedtls
PROVIDES:=libwebsockets
CONFLICTS:=libwebsockets-openssl CONFLICTS:=libwebsockets-openssl
endef endef
@ -70,7 +70,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 PROVIDES:=libwebsockets libwebsockets-openssl
endef endef
ifeq ($(BUILD_VARIANT),openssl) ifeq ($(BUILD_VARIANT),openssl)