From: Fabrice Fontaine Date: Sun, 26 Nov 2017 21:26:40 +0000 (+0100) Subject: linphone: add optional dependency on libupnp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9e5390a20bf7019d950da3849bb305f5edf692c6;p=buildroot.git linphone: add optional dependency on libupnp linphone can optionally use libupnp, so this dependency should be accounted for in linphone.mk. In addition, linphone is not compatible with libupnp18, but misdetects it as a a proper libupnp, causing a build failure. The build failure with libupnp18 currently only happens on the next branch (because libupnp18 has only been added there), but adding the optional dependency on libupnp makes sense for the master branch anyway. Fixes: http://autobuild.buildroot.net/results/473c686f9bc5335d25b720cf1b0c45389138a7b4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk index fb5e18db69..a10d6bb208 100644 --- a/package/linphone/linphone.mk +++ b/package/linphone/linphone.mk @@ -50,4 +50,11 @@ else LINPHONE_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 endif +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LINPHONE_DEPENDENCIES += libupnp +LINPHONE_CONF_OPTS += --enable-upnp +else +LINPHONE_CONF_OPTS += --disable-upnp +endif + $(eval $(autotools-package))