Skip to content

Commit

Permalink
Merge pull request openwrt#19714 from turris-cz/libwebsockets-dependency
Browse files Browse the repository at this point in the history
libwebsockets: fix recursive dependency
  • Loading branch information
BKPepe authored Oct 27, 2022
2 parents 61d1a86 + a4e8cbb commit 4c8e9ad
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 4c8e9ad

Please sign in to comment.