Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #155 from micmac1/PR

Browse source 
freeswitch-stable: Fix mod_unimrcp build failure
This commit is contained in:
Jiri Slachta 2017-06-08 07:46:23 +02:00 committed by GitHub
commit 6252899cf9
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/freeswitch-stable/Makefile
View file

@ -554,6 +554,12 @@ CONFIGURE_ARGS+= \
$(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \ $(if $(CONFIG_FS_STABLE_WITH_PNG),,--without-png) \
$(if $(CONFIG_FS_STABLE_WITH_VPX),,--disable-libvpx) $(if $(CONFIG_FS_STABLE_WITH_VPX),,--disable-libvpx)
# Need to update LDFLAGS for libs/unimrcp, otherwise it will try to link to a
# different apr/apr-util if found.
# FS_ANCHOR: string in build/acmacros/apr.m4 that will be replaced
FS_ANCHOR:=dnl Get build information from APR
FS_APR_LIBS:=-L$(PKG_BUILD_DIR)/libs/apr -L$(PKG_BUILD_DIR)/libs/apr-util
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
$(SED) '/^#/!s/^/#/' $(PKG_BUILD_DIR)/modules.conf $(SED) '/^#/!s/^/#/' $(PKG_BUILD_DIR)/modules.conf
@ -577,6 +583,8 @@ define Build/Prepare
$(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am
$(SED) 's|@PYTHON_LDFLAGS@|$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)|' \ $(SED) 's|@PYTHON_LDFLAGS@|$(TARGET_LDFLAGS) -lpython$(PYTHON_VERSION)|' \
$(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am
$(SED) 's|$(FS_ANCHOR)|APR_SETVAR(LDFLAGS,$(FS_APR_LIBS) $(TARGET_LDFLAGS))|' \
$(PKG_BUILD_DIR)/libs/unimrcp/build/acmacros/apr.m4
# Hack for mod_unimrcp - it has a build-time dep on mod_sofia # Hack for mod_unimrcp - it has a build-time dep on mod_sofia
ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-unimrcp),) ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-unimrcp),)