From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Tue, 13 Mar 2018 12:02:10 +0000 (+0100)
Subject: asterisk-15.x: clean up DEPENDS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28fb0ecc3cf8b2f5e3bd95756ffd03624d61401f;p=feed%2Ftelephony.git

asterisk-15.x: clean up DEPENDS

- The main package does not actually depend on libpopt. Only the utility
  smsq does. This commit reflects that in the dependencies.

- libxslt is only used if generating the XML documentation, which this
  package does not use. So remove the bogus dependency.

- app-sms does not depend on libpopt either. It has another dependency
  on libstdcpp, which is already covered by the main package. This removes
  both dependencies.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/asterisk-15.x/Makefile b/net/asterisk-15.x/Makefile
index 66aa265..5eb1df8 100644
--- a/net/asterisk-15.x/Makefile
+++ b/net/asterisk-15.x/Makefile
@@ -428,7 +428,7 @@ define Package/asterisk15
 $(call Package/asterisk15/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
-  DEPENDS:=+jansson +libcap +libedit +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
+  DEPENDS:=+jansson +libcap +libedit +libncurses +libopenssl +libsqlite3 +libstdcpp +libuuid +libxml2 +zlib
 endef
 
 define Package/asterisk15/description
@@ -542,7 +542,7 @@ CONFIGURE_ARGS+= \
 	--without-osptk \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-pbx-lua),--with-lua="$(STAGING_DIR)/usr",--without-lua) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgres="$(STAGING_DIR)/usr",--without-postgres) \
-	--with-popt="$(STAGING_DIR)/usr" \
+	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-util-smsq),--with-popt="$(STAGING_DIR)/usr",--without-popt) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-chan-console),--with-portaudio="$(STAGING_DIR)/usr",--without-portaudio) \
 	--without-pwlib \
 	--without-radius \
@@ -786,7 +786,7 @@ $(eval $(call BuildAsterisk15Module,app-sayunixtime,Say Unix time,an application
 $(eval $(call BuildAsterisk15Module,app-senddtmf,Send DTMF digits,Sends arbitrary DTMF digits,,,app_senddtmf,,))
 $(eval $(call BuildAsterisk15Module,app-sendtext,Send text,transmit a text message,,,app_sendtext,,))
 $(eval $(call BuildAsterisk15Module,app-skel,Skeleton [sample],skeleton for development of an Asterisk application,,app_skel.conf,app_skel,,))
-$(eval $(call BuildAsterisk15Module,app-sms,SMS,SMS support (ETSI ES 201 912 protocol 1),+libpopt +libstdcpp,,app_sms,,))
+$(eval $(call BuildAsterisk15Module,app-sms,SMS,SMS support (ETSI ES 201 912 protocol 1),,,app_sms,,))
 $(eval $(call BuildAsterisk15Module,app-softhangup,Hang up requested channel,SoftHangup application,,,app_softhangup,,))
 $(eval $(call BuildAsterisk15Module,app-speech,Dialplan Speech,Dialplan Speech Applications,+asterisk15-res-speech,,app_speech_utils,,))
 $(eval $(call BuildAsterisk15Module,app-stack,Stack applications,Stack applications Gosub Return etc.,+asterisk15-res-agi,,app_stack,,))
@@ -1019,6 +1019,6 @@ $(eval $(call BuildAsterisk15Util,check_expr,Expression checker [older version].
 $(eval $(call BuildAsterisk15Util,check_expr2,Expression checker [newer version].,,))
 $(eval $(call BuildAsterisk15Util,conf2ael,Convert .conf to .ael.,+$(PKG_NAME)-pbx-ael,))
 $(eval $(call BuildAsterisk15Util,muted,Listens for AMI events. Mutes soundcard during call.,,muted.conf))
-$(eval $(call BuildAsterisk15Util,smsq,Send messages from command line.,,))
+$(eval $(call BuildAsterisk15Util,smsq,Send messages from command line.,+libpopt,))
 $(eval $(call BuildAsterisk15Util,stereorize,Merge two mono WAV-files to one stereo WAV-file.,,))
 $(eval $(call BuildAsterisk15Util,streamplayer,A utility for reading from a raw TCP stream [MOH source].,,))