diff options
| author | Jiri Slachta <slachta@cesnet.cz> | 2015-04-13 15:11:08 +0200 |
|---|---|---|
| committer | Jiri Slachta <slachta@cesnet.cz> | 2015-04-13 15:11:08 +0200 |
| commit | 29d6aa52abb57d04f756fd753532f6e320bfba71 (patch) | |
| tree | 84ca24ac6a3b9e9a206dac33fda87bdb82d625d8 | |
| parent | 0c0ef8cdb7d71da9aa43fca22098528312e92dce (diff) | |
Revert "FreeSWITCH: fixed cross-compile errors"revert-29-master
| -rw-r--r-- | net/freeswitch/Makefile | 2 | ||||
| -rwxr-xr-x | net/freeswitch/patches/libs-apr-configure_ac.patch | 16 | ||||
| -rwxr-xr-x | net/freeswitch/patches/libs-apr-util-configure_ac.patch | 18 |
3 files changed, 1 insertions, 35 deletions
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 7ccdafc..9eb21fa 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -258,7 +258,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 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl + DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp_git +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl endef diff --git a/net/freeswitch/patches/libs-apr-configure_ac.patch b/net/freeswitch/patches/libs-apr-configure_ac.patch deleted file mode 100755 index e4cf22e..0000000 --- a/net/freeswitch/patches/libs-apr-configure_ac.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/libs/apr/configure.ac -+++ b/libs/apr/configure.ac -@@ -1956,8 +1956,11 @@ - - APR_CHECK_TCP_NODELAY_INHERITED - APR_CHECK_O_NONBLOCK_INHERITED --APR_CHECK_TCP_NODELAY_WITH_CORK -- -+dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling -+if test "$cross_compiling" != yes; then -+ APR_CHECK_TCP_NODELAY_WITH_CORK -+fi -+ - # Look for a way of corking TCP... - APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h) - APR_CHECK_DEFINE(TCP_NOPUSH, netinet/tcp.h) diff --git a/net/freeswitch/patches/libs-apr-util-configure_ac.patch b/net/freeswitch/patches/libs-apr-util-configure_ac.patch deleted file mode 100755 index 3a2e84f..0000000 --- a/net/freeswitch/patches/libs-apr-util-configure_ac.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/libs/apr-util/configure.ac -+++ b/libs/apr-util/configure.ac -@@ -123,9 +123,12 @@ dnl Find an iconv library - APU_FIND_LDAP - APU_CHECK_DBM - APU_CHECK_DBD --APU_CHECK_DBD_MYSQL --APU_CHECK_DBD_SQLITE3 --APU_CHECK_DBD_SQLITE2 -+dnl Check databases ONLY when NOT cross compiling -+if test "$cross_compiling" != yes; then -+ APU_CHECK_DBD_MYSQL -+ APU_CHECK_DBD_SQLITE3 -+ APU_CHECK_DBD_SQLITE2 -+fi - APU_FIND_EXPAT - APU_FIND_ICONV - |