From c63725e867ea8601303672cde1fe61ef604d5dce Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 2 Jun 2017 22:14:02 +0200 Subject: [PATCH 1/2] freeswitch-stable: Fix mod_python build - added sed scripts in order for mod_python to find the right lib to link to - fixed some whitespaces Signed-off-by: Sebastian Kemper --- net/freeswitch-stable/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile index ac1fb65..d84da07 100644 --- a/net/freeswitch-stable/Makefile +++ b/net/freeswitch-stable/Makefile @@ -567,11 +567,15 @@ define Build/Prepare $(PKG_BUILD_DIR)/libs/esl/python/Makefile $(SED) 's|^SITE_DIR=.*|SITE_DIR=$$$$(DESTDIR)$(PYTHON_PKG_DIR)|' \ $(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 - $(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 - $(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 # Hack for mod_unimrcp - it has a build-time dep on mod_sofia From 8e0aed47540173cc5ef5fc4c1bbfb29beeb0945b Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 2 Jun 2017 22:18:51 +0200 Subject: [PATCH 2/2] freeswitch-stable: Fix mod_erlang_event build - added a patch for erlang.m4 so mod_erlang_event finds the right lib to link to Signed-off-by: Sebastian Kemper --- .../patches/150-erlang-m4.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 net/freeswitch-stable/patches/150-erlang-m4.patch diff --git a/net/freeswitch-stable/patches/150-erlang-m4.patch b/net/freeswitch-stable/patches/150-erlang-m4.patch new file mode 100644 index 0000000..893af86 --- /dev/null +++ b/net/freeswitch-stable/patches/150-erlang-m4.patch @@ -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])