diff options
| author | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-10-26 09:12:38 +0200 |
|---|---|---|
| committer | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2022-10-27 14:48:35 +0200 |
| commit | 0171d18e051a0afdc5bc52b9e7913518b2e2a2a0 (patch) | |
| tree | 7957a02a63bc2c6ad3e9acb555345f37a3f6bf4b | |
| parent | 8542fd3f3c5a2696a6617d5d106739e067bc7108 (diff) | |
libwebsockets: fix recursive dependencyopenwrt-18.06
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: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a4e8cbb89a48729b3c3ad615765549628d495b0f)
| -rw-r--r-- | libs/libwebsockets/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 76e6bf063..05691eb3f 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -46,7 +46,6 @@ define Package/libwebsockets/Default DEPENDS:=+zlib +libcap URL:=https://libwebsockets.org MAINTAINER:=Karl Palsson <karlp@etactica.com> - PROVIDES:= libwebsockets endef define Package/libwebsockets-openssl @@ -62,6 +61,7 @@ define Package/libwebsockets-mbedtls TITLE += (mbedTLS) DEPENDS += +libmbedtls VARIANT:=mbedtls + PROVIDES:=libwebsockets CONFLICTS:=libwebsockets-openssl endef @@ -70,7 +70,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) |