libmicrohttpd: Remove one CONFLICTS statement.
authorRob White <redacted>
Thu, 4 Apr 2019 14:31:33 +0000 (15:31 +0100)
committerRob White <redacted>
Thu, 4 Apr 2019 14:31:33 +0000 (15:31 +0100)
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>
libs/libmicrohttpd/Makefile

index b28b65ffab99a7b4248142ea52344e486bf4227d..3e56be5758f4375e004a34dcb0766939763f672f 100644 (file)
@@ -34,7 +34,6 @@ define Package/libmicrohttpd-no-ssl
 $(call Package/libmicrohttpd/default)
   VARIANT:=nossl
   DEFAULT_VARIANT:=1
-  CONFLICTS:=libmicrohttpd-ssl
   PROVIDES:=libmicrohttpd
 endef
 
git clone https://git.99rst.org/PROJECT