OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19701 from turris-cz/libwebsockets-conflicts-provides 

libwebsockets: full variant provides OpenSSL
This commit is contained in:
Josef Schlehofer 2022-10-25 14:28:58 +02:00 committed by GitHub
parent f87899140d 676c5c72b5
commit 02eb18a65f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/libwebsockets/Makefile
View File

@ -56,6 +56,7 @@ define Package/libwebsockets-openssl
TITLE += (OpenSSL) TITLE += (OpenSSL)
DEPENDS += +libopenssl DEPENDS += +libopenssl
VARIANT:=openssl VARIANT:=openssl
CONFLICTS:=libwebsockets-full
endef endef
define Package/libwebsockets-mbedtls define Package/libwebsockets-mbedtls
@ -63,6 +64,7 @@ define Package/libwebsockets-mbedtls
TITLE += (mbedTLS) TITLE += (mbedTLS)
DEPENDS += +libmbedtls DEPENDS += +libmbedtls
VARIANT:=mbedtls VARIANT:=mbedtls
CONFLICTS:=libwebsockets-openssl
endef endef
define Package/libwebsockets-full define Package/libwebsockets-full
@ -70,6 +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
endef endef
ifeq ($(BUILD_VARIANT),openssl) ifeq ($(BUILD_VARIANT),openssl)