summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormicmac12020-07-18 14:06:37 +0000
committerGitHub2020-07-18 14:06:37 +0000
commit70b11b01921d00979bdfcad4ea95a9bd57b411e3 (patch)
treef4f4bd8e0cd1a4bea320f044dce05ca8d83b73da
parent5523d283ac7373ee4cb55908b1b3006df50bb34c (diff)
parentece4d54d6255990bb9d9539709cefa3f2a43076e (diff)
downloadtelephony-70b11b01921d00979bdfcad4ea95a9bd57b411e3.tar.gz
Merge pull request #544 from micmac1/tel-deps
sipgrep/freeswitch: small amendments
-rw-r--r--net/freeswitch/Makefile2
-rw-r--r--net/sipgrep/Makefile7
2 files changed, 5 insertions, 4 deletions
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 14e4911..6696788 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -336,7 +336,7 @@ endef
define Package/libfreetdm/FTModule
define Package/libfreetdm-ftmod-$(subst _,-,$(1))
$(call Package/libfreetdm/Default)
- DEPENDS:=PACKAGE_libfreetdm-ftmod-$(subst _,-,$(1)):libfreetdm \
+ DEPENDS:=libfreetdm \
$(patsubst +%,+PACKAGE_libfreetdm-ftmod-$(subst _,-,$(1)):%,$(4))
TITLE:=$(2) FreeTDM module
endef
diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile
index 06e0089..e69b7d6 100644
--- a/net/sipgrep/Makefile
+++ b/net/sipgrep/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/sipcapture/sipgrep.git
PKG_SOURCE_VERSION:=1cc00079cd80310f7e8b1a696e9a02b8a2b25e04
PKG_SOURCE_DATE=2019-06-27
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MIRROR_HASH:=3480f83a4af2a2972f3aa981343b067fa35ddc74f42c3e459630f31aba8f2d91
PKG_BUILD_PARALLEL:=1
@@ -25,6 +25,8 @@ PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
+PKG_CONFIG_DEPENDS:=CONFIG_IPV6
+
include $(INCLUDE_DIR)/package.mk
define Package/sipgrep
@@ -42,8 +44,7 @@ troubleshoot SIP signaling over IP networks, allowing the user to
specify extended regular expressions matching against SIP headers.
endef
-CONFIGURE_ARGS += \
- --enable-ipv6
+CONFIGURE_ARGS+=$(if $(CONFIG_IPV6),--enable-ipv6)
define Package/sipgrep/install
$(INSTALL_DIR) $(1)/usr/bin