From: Rob White <redacted>
Date: Thu, 4 Apr 2019 14:31:33 +0000 (+0100)
Subject: libmicrohttpd: Remove one CONFLICTS statement.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=753855b8a15f8299ed0c371a861258f584055c4e;p=openwrt-packages.git

libmicrohttpd: Remove one CONFLICTS statement.

Having CONFLICTS for each variant in the other variant causes recursive dependency error, even though the two variants do conflict with each other. This commit removes one of the CONFLICT lines.
Build now completes without error on SDK.

Signed-off-by: Rob White <redacted>
---

diff --git a/libs/libmicrohttpd/Makefile b/libs/libmicrohttpd/Makefile
index b28b65ffa..3e56be575 100644
--- a/libs/libmicrohttpd/Makefile
+++ b/libs/libmicrohttpd/Makefile
@@ -34,7 +34,6 @@ define Package/libmicrohttpd-no-ssl
 $(call Package/libmicrohttpd/default)
   VARIANT:=nossl
   DEFAULT_VARIANT:=1
-  CONFLICTS:=libmicrohttpd-ssl
   PROVIDES:=libmicrohttpd
 endef