From 53272bf9a3dafe959e435c347e901aff54dd3138 Mon Sep 17 00:00:00 2001 From: Rob White Date: Sun, 21 Apr 2019 08:18:53 +0100 Subject: [PATCH] libmicrohttpd: Prevent Recursive Dependency Maintainer: Alexander Couzens lynxis@fe80.eu Compile Tested: Snapshot SDK Run Tested: target - ath79, hardware - gl-ar300m16, package - nodogsplash v3.2.1 and nodogsplash v3.3.1, Openwrt Snapshot. Description: If a package depends on libmicrohttpd but does not specify which variant, a recursive dependency error occurs caused by the superfluous CONFLICTS line. With this change, a package will get the named variant, or default to the no-ssl variant if only libmicrohttpd is specified. Signed-off-by: Rob White --- libs/libmicrohttpd/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile index 3e56be575..93b994b50 100644 --- a/libs/libmicrohttpd/Makefile +++ b/libs/libmicrohttpd/Makefile @@ -42,7 +42,6 @@ $(call Package/libmicrohttpd/default) TITLE+= with SSL support VARIANT:=ssl DEPENDS:=+libgcrypt +libgnutls +libgpg-error - CONFLICTS:=libmicrohttpd-no-ssl PROVIDES:=libmicrohttpd endef