OpenWrt
/
telephony
mirror of https://git.openwrt.org/feed/telephony.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

freeswitch-stable: package cleanups 

- removed xmlrpc-c todo; I compiled with external version in staging
  dir, it didn't make a difference (didn't seem to be used)
- removed swig calls as per suggestion from upstream

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2017-06-14 22:55:24 +02:00
parent f297dff388
commit ceff7f10c9
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/freeswitch-stable/Makefile
View File

@ -5,10 +5,6 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
# TODO
#
# - try to use system xmlrpc-c once it compiles again :-)
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch PRG_NAME:=freeswitch
@ -27,8 +23,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:= \ PKG_BUILD_DEPENDS:= \
erlang \ erlang \
libjpeg \ libjpeg \
python \ python
swig/host
# With mod_ssml and mod_rayo enabled the parallel compiles always failed # With mod_ssml and mod_rayo enabled the parallel compiles always failed
#PKG_BUILD_PARALLEL:=1 #PKG_BUILD_PARALLEL:=1
@ -594,13 +589,6 @@ define Build/Prepare
$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)),
$(SED) '/mod_$(m)$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf)) $(SED) '/mod_$(m)$$$$/s/^#//' $(PKG_BUILD_DIR)/modules.conf))
find $(PKG_BUILD_DIR)/libs/esl -name Makefile \
-exec $(SED) 's|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \
{} \;
find $(PKG_BUILD_DIR)/src/mod/languages -name Makefile.am \
-exec $(SED) 's|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \
{} \;
$(SED) 's|^LOCAL_CFLAGS=.*|LOCAL_CFLAGS=-I$(PYTHON_INC_DIR)|' \ $(SED) 's|^LOCAL_CFLAGS=.*|LOCAL_CFLAGS=-I$(PYTHON_INC_DIR)|' \
$(PKG_BUILD_DIR)/libs/esl/python/Makefile $(PKG_BUILD_DIR)/libs/esl/python/Makefile
$(SED) 's|^LOCAL_LDFLAGS=.*|LOCAL_LDFLAGS=$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)|' \ $(SED) 's|^LOCAL_LDFLAGS=.*|LOCAL_LDFLAGS=$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)|' \
@ -631,10 +619,8 @@ define Build/Configure
endef endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/src/mod/languages/mod_lua swigclean)
$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/src/mod/languages/mod_python swigclean)
$(call Build/Compile/Default) $(call Build/Compile/Default)
$(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/libs/esl swigclean pymod) $(call Build/Compile/Default,-C $(PKG_BUILD_DIR)/libs/esl pymod)
endef endef
define Build/Install define Build/Install

17
net/freeswitch-stable/patches/160-mod_lua-swig.patch
View File

@ -1,17 +0,0 @@
--- a/src/mod/languages/mod_lua/Makefile.am
+++ b/src/mod/languages/mod_lua/Makefile.am
@@ -24,12 +24,12 @@ if SYSTEM_LUA
mod_lua_la_LDFLAGS += $(LUA_LIBS)
endif
-reswig: swigclean lua_wrap
+reswig: swigclean mod_lua_wrap.cpp
swigclean: clean
rm -f mod_lua_wrap.*
-lua_wrap: mod_lua_extra.c
+mod_lua_wrap.cpp: mod_lua_extra.c
swig2.0 -lua -c++ -I../../../../src/include -oh mod_lua_wrap.h -o mod_lua_wrap.cpp freeswitch.i
echo "#include \"mod_lua_extra.c\"" >> mod_lua_wrap.cpp
patch -s -p0 -i hack.diff