Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19714 from turris-cz/libwebsockets-dependency

Browse source 
libwebsockets: fix recursive dependency
This commit is contained in:
Josef Schlehofer 2022-10-27 14:24:35 +02:00 committed by GitHub
commit 4c8e9ad20c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -48,7 +48,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
@ -64,6 +63,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
@ -72,7 +72,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)