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

Merge pull request #154 from micmac1/PR

Browse source 
PR for freeswitch-stable
This commit is contained in:
Jo-Philipp Wich 2017-06-02 23:25:41 +02:00 committed by GitHub
commit 9c8937228a
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/freeswitch-stable/Makefile
View file

@ -567,11 +567,15 @@ define Build/Prepare
$(PKG_BUILD_DIR)/libs/esl/python/Makefile $(PKG_BUILD_DIR)/libs/esl/python/Makefile
$(SED) 's|^SITE_DIR=.*|SITE_DIR=$$$$(DESTDIR)$(PYTHON_PKG_DIR)|' \ $(SED) 's|^SITE_DIR=.*|SITE_DIR=$$$$(DESTDIR)$(PYTHON_PKG_DIR)|' \
$(PKG_BUILD_DIR)/libs/esl/python/Makefile $(PKG_BUILD_DIR)/libs/esl/python/Makefile
$(SED)'s|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \ $(SED) 's|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \
$(PKG_BUILD_DIR)/libs/esl/python/Makefile $(PKG_BUILD_DIR)/libs/esl/python/Makefile
$(SED)'s|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \ $(SED) 's|swig2.0|$(STAGING_DIR_HOSTPKG)/bin/swig|' \
$(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am $(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am
$(SED)'s|^PYTHON_SITE_DIR=.*|PYTHON_SITE_DIR=$(PYTHON_PKG_DIR)|' \ $(SED) 's|^PYTHON_SITE_DIR=.*|PYTHON_SITE_DIR=$(PYTHON_PKG_DIR)|' \
$(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am
$(SED) 's|@PYTHON_CFLAGS@|-I$(PYTHON_INC_DIR)|' \
$(PKG_BUILD_DIR)/src/mod/languages/mod_python/Makefile.am
$(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
# 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

23
net/freeswitch-stable/patches/150-erlang-m4.patch Normal file
View file

@ -0,0 +1,23 @@
--- a/build/config/erlang.m4
+++ b/build/config/erlang.m4
@@ -43,9 +43,20 @@ then
ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
LIBS="-L$ERLANG_LIBDIR $LIBS"
fi
+
+ #
+ # Don't use the above ERLANG_LDFLAGS
+ #
+ ERLANG_LIBDIR="$STAGING_DIR/usr/lib"
+ ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
+ LIBS="-L$ERLANG_LIBDIR $LIBS"
AC_MSG_RESULT([$ERLANG_LIBDIR])
ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
+ #
+ # Don't use the above ERLANG_INCDIR
+ #
+ ERLANG_INCDIR="$STAGING_DIR/usr/include"
AC_MSG_CHECKING([erlang incdir])
if test -z "`echo $ERLANG_INCDIR`" ; then
AC_MSG_ERROR([failed])