diff options
| author | Rob White <rob@blue-wave.net> | 2019-04-04 15:31:33 +0100 |
|---|---|---|
| committer | Rob White <rob@blue-wave.net> | 2019-04-04 15:31:33 +0100 |
| commit | 753855b8a15f8299ed0c371a861258f584055c4e (patch) | |
| tree | 9750675dcb8457d42075c12d6dc56519e35d129e /libs/libmicrohttpd | |
| parent | edec5b104e4fe08a6e745b238d3f1a4d9b63cb5a (diff) | |
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 <rob@blue-wave.net>
Diffstat (limited to 'libs/libmicrohttpd')
| -rw-r--r-- | libs/libmicrohttpd/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
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 |