summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2016-04-19 11:47:06 +0200
committerJohn Crispin <blogic@openwrt.org>2016-04-19 11:47:06 +0200
commitcc2b959905d2ca724629a6531b4b587d54554779 (patch)
tree66ef6b9097086e5dbdc90daf5b62c7a38632f338
parentea86469ec5df3c22b0bec247a9f3ba14c195641c (diff)
freeswitch: libsqlite2 and libedit do not exist
this leads to lots of these lines when updating the feed in CC WARNING: No feed for package 'libsqlite2' found, maybe it's already part of the standard packages? WARNING: No feed for package 'libedit' found, maybe it's already part of the standard packages? Signed-off-by: John Crispin <blogic@openwrt.org>
-rw-r--r--net/freeswitch/Config.in12
-rw-r--r--net/freeswitch/Makefile8
2 files changed, 1 insertions, 19 deletions
diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index 21a61ea..07a8078 100644
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -77,11 +77,6 @@ menu "Configuration"
help
Compile libs/apr-util with PostgreSQL support.
- config FS_WITH_SQLITE2
- bool "SQLITE2"
- help
- Compile libs/apr-util with SQLITE2 support.
-
config FS_WITH_SQLITE3
bool "SQLITE3"
help
@@ -141,13 +136,6 @@ menu "Configuration"
help
Enable this option to allow use of OGG in mod_celt.
- config FS_WITH_CORE_LIBEDIT_SUPPORT
- bool "Compile with libedit Support"
- default n
- help
- Compile with libedit Support. ATM, libedit isn't
- supported by OpenWRT.
-
config FS_WITH_FHS
bool "Follow the FHS when placing files and directories"
default y
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index c7fe02f..1d2ded3 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -45,10 +45,8 @@ endif
PKG_BUILD_DEPENDS:= \
- FS_WITH_CORE_LIBEDIT_SUPPORT:libedit \
FS_WITH_MYSQL:libmysqlclient \
FS_WITH_POSTGRESQL:libpq \
- FS_WITH_SQLITE2:libsqlite2 \
FS_WITH_SQLITE3:libsqlite3 \
FS_WITH_APR_SCTP:sctp \
@@ -210,7 +208,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_FS_WITH_APR_SCTP \
CONFIG_FS_WITH_APR_THREADS \
CONFIG_FS_WITH_BUILTIN_ZRTP \
- CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT \
CONFIG_FS_WITH_DEFAULT_HEAD \
CONFIG_FS_WITH_ERLANG \
CONFIG_FS_WITH_FHS \
@@ -227,7 +224,6 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_FS_WITH_POSTGRESQL \
CONFIG_FS_WITH_PYTHON \
CONFIG_FS_WITH_SILENT_RULES \
- CONFIG_FS_WITH_SQLITE2 \
CONFIG_FS_WITH_SQLITE3 \
CONFIG_FS_WITH_SRTP \
CONFIG_FS_WITH_SRTP_GENERIC_AESICM \
@@ -267,7 +263,7 @@ define Package/$(PKG_NAME)
$(call Package/$(PKG_NAME)/Default)
MENU:=1
TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT))
- DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libfreetype +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpng +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE2:libsqlite2 +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl +libvpx
+ DEPENDS:=+FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libfreetype +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpng +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl +libvpx
endef
@@ -578,7 +574,6 @@ CONFIGURE_ARGS+= \
--with-modinstdir="/usr/lib/$(PKG_NAME)" \
--with-random="/dev/urandom" \
$(call autoconf_bool,CONFIG_FS_WITH_BUILTIN_ZRTP,zrtp) \
- $(call autoconf_bool,CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT,core-libedit-support) \
$(call autoconf_bool,CONFIG_FS_WITH_FHS,fhs) \
$(call autoconf_bool,CONFIG_FS_WITH_APR_IPV6,ipv6) \
$(call autoconf_bool,CONFIG_FS_WITH_LZMA,lzma) \
@@ -607,7 +602,6 @@ CONFIGURE_ARGS+= \
$(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
--with$(if $(CONFIG_FS_WITH_MYSQL),,out)-mysql \
--with$(if $(CONFIG_FS_WITH_POSTGRESQL),,out)-pgsql \
- --with$(if $(CONFIG_FS_WITH_SQLITE2),,out)-sqlite2 \
--with$(if $(CONFIG_FS_WITH_SQLITE3),,out)-sqlite3 \