aboutsummaryrefslogtreecommitdiff
path: root/libs/libmicrohttpd
diff options
context:
space:
mode:
authorRob White <rob@blue-wave.net>2019-04-21 08:18:53 +0100
committerRob White <rob@blue-wave.net>2019-04-21 08:18:53 +0100
commit53272bf9a3dafe959e435c347e901aff54dd3138 (patch)
treed2328fa0965f794490644a68c8d155d39cedca59 /libs/libmicrohttpd
parentad251d45ca09514bb5b5165b014ab2b9548357a9 (diff)
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 <rob@blue-wave.net>
Diffstat (limited to 'libs/libmicrohttpd')
-rw-r--r--libs/libmicrohttpd/Makefile1
1 files changed, 0 insertions, 1 deletions
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