+++ /dev/null
---- /dev/null
-+++ b/build/openwrt_rules.mk
-@@ -0,0 +1,7 @@
-+OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
-+STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
-+STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
-+ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
-+GNU_TARGET_NAME=$(ARCH)-openwrt-linux
-+
-+include $(OPENWRT_DIR)/rules.mk
--- /dev/null
+--- /dev/null
++++ b/build/openwrt_rules.mk
+@@ -0,0 +1,7 @@
++OPENWRT_DIR=$(shell (cd $(BASE)/../../..;pwd))
++STAGING_PREFIX=$(OPENWRT_DIR)/staging_dir/host
++STAGING_DIR=$(OPENWRT_DIR)/staging_dir/$(shell (cd $(BASE)/..;basename `pwd`))
++ARCH="$(shell grep CONFIG_ARCH $(OPENWRT_DIR)/.config|cut -d= -d'"' -f2)"
++GNU_TARGET_NAME=$(ARCH)-openwrt-linux
++
++include $(OPENWRT_DIR)/rules.mk
--- /dev/null
+--- a/build/modules.conf.in
++++ b/build/modules.conf.in
+@@ -33,6 +33,7 @@ applications/mod_httapi
+ #applications/mod_rad_auth
+ #applications/mod_redis
+ #applications/mod_rss
++#applications/mod_skel
+ #applications/mod_sonar
+ applications/mod_sms
+ #applications/mod_snapshot
--- /dev/null
+--- a/build/config/erlang.m4
++++ b/build/config/erlang.m4
+@@ -16,25 +16,26 @@ then
+
+ if test "$with_erlang" != "yes" -a "$with_erlang" != "try" ; then
+ AC_MSG_CHECKING([for erlang])
+- if test ! -x "$with_erlang" ; then
++ if test ! -x "$with_erlang/../../host/lib/erlang/bin" ; then
+ AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
+ fi
+- AC_MSG_RESULT([$with_erlang])
+- AC_SUBST([ERLANG], ["$with_erlang"])
++ AC_MSG_RESULT(["$with_erlang/../../host/lib/erlang/bin/erl"])
++ AC_SUBST([ERL],["$with_erlang/../../host/lib/erlang/bin/erl"])
+ else
+- AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
++ AC_ERLANG_NEED_ERL(["$with_erlang/../../host/lib/erlang/bin"])
+ fi
+
+- if test "$ERLANG" != "no" ; then
++ if test "$ERL" != "no" ; then
+ AC_MSG_CHECKING([erlang version])
+- ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
++ ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
+
+ if test -z "$ERLANG_VER" ; then
+ AC_MSG_ERROR([Unable to detect erlang version])
++ else
++ AC_MSG_RESULT([$ERLANG_VER])
+ fi
+- AC_MSG_RESULT([$ERLANG_VER])
+
+- ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
++ ERLANG_LIBDIR="$with_erlang/lib"
+ AC_MSG_CHECKING([erlang libdir])
+ if test -z "`echo $ERLANG_LIBDIR`" ; then
+ AC_MSG_ERROR([failed])
+@@ -44,7 +45,7 @@ then
+ fi
+ 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`
++ ERLANG_INCDIR="$with_erlang/include"
+ AC_MSG_CHECKING([erlang incdir])
+ if test -z "`echo $ERLANG_INCDIR`" ; then
+ AC_MSG_ERROR([failed])
+@@ -61,7 +62,8 @@ then
+ # check liei
+ AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
+ # maybe someday ei will actually expose this?
+- AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
++ # until then, we comment it out
++ #AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
+
+ if test "$has_libei" = "no" ; then
+ AS_IF([test "$with_erlang" = "try"],
--- /dev/null
+--- a/configure.ac
++++ b/configure.ac
+@@ -803,7 +803,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+
+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
+
+-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
+ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
+
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
--- /dev/null
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,7 @@
++BASE=.
++
++include $(BASE)/build/openwrt_rules.mk
++
+ EXTRA_DIST =
+ SUBDIRS = . src build
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+@@ -171,7 +175,6 @@ ZRTP_LIBS = -lbn -lzrtp
+ libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
+ libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
+ CORE_LIBS += libs/libzrtp/libzrtp.a
+-LIBS += libs/libzrtp/third_party/bnlib/libbn.a
+ endif
+
+ library_includedir = $(includedir)
+@@ -630,7 +633,9 @@ sndfile-reconf:
+
+ tiff-reconf:
+ cd libs/tiff-4.0.2 && autoreconf -fi
+- cd libs/tiff-4.0.2 && sh ./configure.gnu
++ cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
++ cd libs/spandsp && autoreconf -fi
++ cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
+ cd libs/tiff-4.0.2 && make
+
+ python-reconf:
+@@ -653,9 +658,6 @@ iks-reconf:
+ $(MAKE) mod_dingaling-clean
+
+ spandsp-reconf: tiff-reconf
+- cd libs/spandsp && $(MAKE) clean || echo
+- cd libs/spandsp && autoreconf -fi
+- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix)
+ cd libs/spandsp && $(MAKE)
+
+ sofia-reconf:
+++ /dev/null
---- a/build/modules.conf.in
-+++ b/build/modules.conf.in
-@@ -33,6 +33,7 @@ applications/mod_httapi
- #applications/mod_rad_auth
- #applications/mod_redis
- #applications/mod_rss
-+#applications/mod_skel
- #applications/mod_sonar
- applications/mod_sms
- #applications/mod_snapshot
+++ /dev/null
---- a/configure.in
-+++ b/configure.in
-@@ -162,7 +162,7 @@ if test "${enable_optimizer}" = "yes" ;
- AX_CC_MAXOPT
- fi
-
--AX_PATH_LIBGNUTLS()
-+#AX_PATH_LIBGNUTLS()
-
- # set defaults for use on all platforms
- SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu"
-@@ -614,7 +614,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
-
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
-
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
-+# AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
-
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[
+++ /dev/null
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,7 @@
-+BASE=.
-+
-+include $(BASE)/build/openwrt_rules.mk
-+
- EXTRA_DIST =
- SUBDIRS = . src
- AUTOMAKE_OPTIONS = foreign
-@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp
- libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
- libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
- CORE_LIBS += libs/libzrtp/libzrtp.a
--LIBS += libs/libzrtp/third_party/bnlib/libbn.a
- endif
-
- library_includedir = $(includedir)
-@@ -427,7 +430,7 @@ $(switch_builddir)/quiet_libtool: $(swit
- @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
-
- build/print_git_revision: build/print_git_revision.c
-- $(CC) -o $@ $<
-+ $(HOSTCC) -o $@ $<
-
- src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
- @cat $< > $@; \
-@@ -665,7 +668,9 @@ sndfile-reconf:
-
- tiff-reconf:
- cd libs/tiff-4.0.2 && autoreconf -fi
-- cd libs/tiff-4.0.2 && sh ./configure.gnu
-+ cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
-+ cd libs/spandsp && autoreconf -fi
-+ cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
- cd libs/tiff-4.0.2 && make
-
- python-reconf:
-@@ -690,9 +695,6 @@ iks-reconf:
- $(MAKE) mod_dingaling-clean
-
- spandsp-reconf: tiff-reconf
-- cd libs/spandsp && $(MAKE) clean || echo
-- cd libs/spandsp && autoreconf -fi
-- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix)
- cd libs/spandsp && $(MAKE)
-
- sofia-reconf:
+++ /dev/null
---- a/libs/esl/Makefile
-+++ b/libs/esl/Makefile
-@@ -1,3 +1,6 @@
-+BASE=../..
-+include $(BASE)/build/openwrt_rules.mk
-+
- include eslmake.rules
- PWD=$(shell pwd)
- INCS=-I$(PWD)/src/include
+++ /dev/null
---- a/libs/spandsp/src/spandsp/fast_convert.h
-+++ b/libs/spandsp/src/spandsp/fast_convert.h
-@@ -195,7 +195,7 @@ extern "C"
- {
- return (long int) (x);
- }
--#elif defined(__ppc__) || defined(__powerpc__)
-+#elif 0 /* defined(__ppc__) || defined(__powerpc__) */
- static __inline__ long int lfastrint(register double x)
- {
- int res[2];
+++ /dev/null
---- a/libs/spandsp/src/t4_rx.c
-+++ b/libs/spandsp/src/t4_rx.c
-@@ -50,7 +50,7 @@
- #include "spandsp/stdbool.h"
- #endif
- #include "floating_fudge.h"
--#include <tiffio.h>
-+#include <tiffiop.h>
-
- #include "spandsp/telephony.h"
- #include "spandsp/alloc.h"
+++ /dev/null
---- a/libs/spandsp/src/t4_tx.c
-+++ b/libs/spandsp/src/t4_tx.c
-@@ -50,7 +50,7 @@
- #include "spandsp/stdbool.h"
- #endif
- #include "floating_fudge.h"
--#include <tiffio.h>
-+#include <tiffiop.h>
-
- #include "spandsp/telephony.h"
- #include "spandsp/alloc.h"
+++ /dev/null
---- a/libs/xmlrpc-c/config.mk.in
-+++ b/libs/xmlrpc-c/config.mk.in
-@@ -335,8 +335,8 @@ endif
- # The cross compiling user can update config.mk or override
- # BUILDTOOL_CC on a make command.
-
--BUILDTOOL_CC = $(CC)
--BUILDTOOL_CCLD = $(CCLD)
-+BUILDTOOL_CC = $(HOSTCC)
-+BUILDTOOL_CCLD = $(HOSTCC)
-
- # Here are the commands 'make install' uses to install various kinds of files:
-
+++ /dev/null
---- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
-+++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
-@@ -1,3 +1,5 @@
-+TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd))
-+
- ifeq ($(SRCDIR),)
- updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
- EXPATDIR := $(call updir,$(CURDIR))
-@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),)
- endif
- SUBDIR := lib/expat/gennmtab
-
-+include $(TOPDIR)/rules.mk
- include $(BLDDIR)/config.mk
-
- LDFLAGS = $(LADD)
+++ /dev/null
---- a/libs/libzrtp/include/zrtp_config.h
-+++ b/libs/libzrtp/include/zrtp_config.h
-@@ -68,8 +68,16 @@
- * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically
- */
- #if !defined(ZRTP_BYTE_ORDER)
-+#if defined(linux) || defined(__linux)
-
--#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
-+#include <endian.h>
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN
-+#elif __BYTE_ORDER == __BIG_ENDIAN
-+#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN
-+#endif
-+
-+#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
- defined(__i386) || defined(_M_IX86) || defined(__I86__)
- /*
- * Generic i386 processor family, little-endian
--- /dev/null
+--- a/libs/libcodec2/src/Makefile.am
++++ b/libs/libcodec2/src/Makefile.am
+@@ -88,6 +88,12 @@ codebookge.$(OBJEXT): codebookge.c
+
+ codebook.lo: codebook.c
+
++generate_codebook:
++ $(CC_FOR_BUILD) -o generate_codebook generate_codebook.c -lm
++
++genlspdtcb:
++ $(CC_FOR_BUILD) -o genlspdtcb genlspdtcb.c -lm
++
+ codebook.c: generate_codebook $(CODEBOOKS)
+ ./generate_codebook lsp_cb $(CODEBOOKS) > codebook.c
+
--- /dev/null
+--- a/libs/libzrtp/include/zrtp_config.h
++++ b/libs/libzrtp/include/zrtp_config.h
+@@ -68,8 +68,16 @@
+ * If the byte order is not specified manually in zrtp_config_user.h - try to detect it automatically
+ */
+ #if !defined(ZRTP_BYTE_ORDER)
++#if defined(linux) || defined(__linux)
+
+-#if defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
++#include <endian.h>
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#define ZRTP_BYTE_ORDER ZBO_LITTLE_ENDIAN
++#elif __BYTE_ORDER == __BIG_ENDIAN
++#define ZRTP_BYTE_ORDER ZBO_BIG_ENDIAN
++#endif
++
++#elif defined(_i386_) || defined(i_386_) || defined(_X86_) || defined(x86) || defined(__i386__) || \
+ defined(__i386) || defined(_M_IX86) || defined(__I86__)
+ /*
+ * Generic i386 processor family, little-endian
--- /dev/null
+--- a/libs/spandsp/src/spandsp/fast_convert.h
++++ b/libs/spandsp/src/spandsp/fast_convert.h
+@@ -195,7 +195,7 @@ extern "C"
+ {
+ return (long int) (x);
+ }
+-#elif defined(__ppc__) || defined(__powerpc__)
++#elif 0 /* defined(__ppc__) || defined(__powerpc__) */
+ static __inline__ long int lfastrint(register double x)
+ {
+ int res[2];
--- /dev/null
+--- a/libs/spandsp/src/t4_rx.c
++++ b/libs/spandsp/src/t4_rx.c
+@@ -50,7 +50,7 @@
+ #include "spandsp/stdbool.h"
+ #endif
+ #include "floating_fudge.h"
+-#include <tiffio.h>
++#include <tiffiop.h>
+
+ #include "spandsp/telephony.h"
+ #include "spandsp/alloc.h"
--- /dev/null
+--- a/libs/spandsp/src/t4_tx.c
++++ b/libs/spandsp/src/t4_tx.c
+@@ -50,7 +50,7 @@
+ #include "spandsp/stdbool.h"
+ #endif
+ #include "floating_fudge.h"
+-#include <tiffio.h>
++#include <tiffiop.h>
+
+ #include "spandsp/telephony.h"
+ #include "spandsp/alloc.h"
--- /dev/null
+--- a/libs/xmlrpc-c/config.mk.in
++++ b/libs/xmlrpc-c/config.mk.in
+@@ -335,8 +335,8 @@ endif
+ # The cross compiling user can update config.mk or override
+ # BUILDTOOL_CC on a make command.
+
+-BUILDTOOL_CC = $(CC)
+-BUILDTOOL_CCLD = $(CCLD)
++BUILDTOOL_CC = $(HOSTCC)
++BUILDTOOL_CCLD = $(HOSTCC)
+
+ # Here are the commands 'make install' uses to install various kinds of files:
+
--- /dev/null
+--- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
++++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile
+@@ -1,3 +1,5 @@
++TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd))
++
+ ifeq ($(SRCDIR),)
+ updir = $(shell echo $(dir $(1)) | sed 's/.$$//')
+ EXPATDIR := $(call updir,$(CURDIR))
+@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),)
+ endif
+ SUBDIR := lib/expat/gennmtab
+
++include $(TOPDIR)/rules.mk
+ include $(BLDDIR)/config.mk
+
+ LDFLAGS = $(LADD)
--- /dev/null
+--- a/src/include/timerfd_wrap.h
++++ b/src/include/timerfd_wrap.h
+@@ -55,20 +55,12 @@ SWITCH_BEGIN_EXTERN_C
+
+
+ #ifndef __NR_timerfd
+-#if defined(__x86_64__)
+-#define __NR_timerfd_create 283
+-#define __NR_timerfd_settime 286
+-#define __NR_timerfd_gettime 287
+-#elif defined(__i386__)
+-#define __NR_timerfd_create 322
+-#define __NR_timerfd_settime 325
+-#define __NR_timerfd_gettime 326
+-#else
+-#error invalid system
+-#endif
++#include <linux/unistd.h>
+ #endif
+
+-#define TFD_TIMER_ABSTIME (1 << 0)
++#ifndef TFD_TIMER_ABSTIME
++#include <sys/timerfd.h>
++#endif
+
+ int timerfd_create(int clockid, int flags)
+ {
--- /dev/null
+--- a/src/mod/codecs/mod_isac/typedefs.h
++++ b/src/mod/codecs/mod_isac/typedefs.h
+@@ -66,7 +66,7 @@
+ #define WEBRTC_ARCH_X86
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
+-#elif defined(__ARMEL__)
++#elif defined(__ARMEL__) || defined(__mips__)
+ // TODO(andrew): We'd prefer to control platform defines here, but this is
+ // currently provided by the Android makefiles. Commented to avoid duplicate
+ // definition warnings.
--- /dev/null
+--- a/src/mod/codecs/mod_opus/Makefile.am
++++ b/src/mod/codecs/mod_opus/Makefile.am
+@@ -17,7 +17,7 @@ $(OPUS_DIR)/configure:
+
+ $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure
+ mkdir -p $(OPUS_BUILDDIR)
+- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
++ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
+ $(TOUCH_TARGET)
+
+ $(OPUS_LA): $(OPUS_BUILDDIR)/Makefile
--- /dev/null
+--- a/src/mod/directories/mod_ldap/Makefile.am
++++ b/src/mod/directories/mod_ldap/Makefile.am
+@@ -13,7 +13,7 @@ mod_ldap_la_CFLAGS = $(AM_CFLAGS) -DWI
+ mod_ldap_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
+ mod_ldap_la_LDFLAGS = -avoid-version -module -no-undefined -shared
+
+-MY_DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
++MY_DEFAULT_ARGS=--host=$(host) --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb
+
+ $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
+
--- /dev/null
+--- a/src/mod/endpoints/mod_gsmopen/Makefile.am
++++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
+@@ -12,7 +12,7 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libsp
+ mod_LTLIBRARIES = mod_gsmopen.la
+ mod_gsmopen_la_SOURCES = mod_gsmopen.cpp gsmopen_protocol.cpp
+ mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
+-mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
++mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -fpermissive
+ mod_gsmopen_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
+ mod_gsmopen_la_LDFLAGS = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
+
--- /dev/null
+--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
++++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
+@@ -56,21 +56,6 @@ dnl Checks for programs.
+ AC_PROG_CPP
+ AC_PROG_CXX
+
+-dnl check for gcc 2.95.x
+-AC_TRY_RUN([
+-#include <unistd.h>
+-main()
+-{
+-#if defined(__GNUC__) && \
+- ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+- return 1;
+-#endif
+- return 0;
+-}
+-],,
+-[echo "need at least gcc 2.95 to compile correctly"
+-exit 1])
+-
+ dnl check for alloca
+ AC_FUNC_ALLOCA
+
+++ /dev/null
---- a/src/include/timerfd_wrap.h
-+++ b/src/include/timerfd_wrap.h
-@@ -55,20 +55,12 @@ SWITCH_BEGIN_EXTERN_C
-
-
- #ifndef __NR_timerfd
--#if defined(__x86_64__)
--#define __NR_timerfd_create 283
--#define __NR_timerfd_settime 286
--#define __NR_timerfd_gettime 287
--#elif defined(__i386__)
--#define __NR_timerfd_create 322
--#define __NR_timerfd_settime 325
--#define __NR_timerfd_gettime 326
--#else
--#error invalid system
--#endif
-+#include <linux/unistd.h>
- #endif
-
--#define TFD_TIMER_ABSTIME (1 << 0)
-+#ifndef TFD_TIMER_ABSTIME
-+#include <sys/timerfd.h>
-+#endif
-
- int timerfd_create(int clockid, int flags)
- {
+++ /dev/null
---- a/src/mod/codecs/mod_opus/Makefile
-+++ b/src/mod/codecs/mod_opus/Makefile
-@@ -12,12 +12,13 @@ OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.l
- LOCAL_LIBADD=$(OPUS_LA)
-
- include $(BASE)/build/modmake.rules
-+include $(BASE)/build/openwrt_rules.mk
-
- $(OPUS_DIR):
- $(GETLIB) $(OPUS).tar.gz
-
- $(OPUS_DIR)/Makefile: $(OPUS_DIR)
-- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
-+ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(GNU_TARGET_NAME) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
- $(TOUCH_TARGET)
-
- $(OPUS_LA): $(OPUS_DIR)/Makefile
+++ /dev/null
---- a/src/mod/codecs/mod_silk/Makefile
-+++ b/src/mod/codecs/mod_silk/Makefile
-@@ -1,4 +1,5 @@
- BASE=../../../..
-+include $(BASE)/build/openwrt_rules.mk
- SILK_DIR=$(switch_srcdir)/libs/silk
- SILK_BUILDDIR=$(switch_builddir)/libs/silk
- LOCAL_CFLAGS=-I$(SILK_DIR)/src -I$(SILK_DIR)/interface
-@@ -8,5 +9,5 @@ LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o
- include $(BASE)/build/modmake.rules
-
- $(SILK_LA): $(SILK_DIR)/.update
-- cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE)
-+ cd $(SILK_BUILDDIR) && ./configure --host=$(GNU_TARGET_NAME) --disable-shared && make clean && $(MAKE)
- $(TOUCH_TARGET)
+++ /dev/null
---- a/src/mod/directories/mod_ldap/Makefile
-+++ b/src/mod/directories/mod_ldap/Makefile
-@@ -21,7 +21,7 @@ $(LDAP_DIR):
-
- $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
- mkdir -p $(LDAP_BUILDDIR)
-- cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
-+ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) --with-yielding_select=yes
- $(TOUCH_TARGET)
-
- $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile
+++ /dev/null
---- a/src/mod/endpoints/mod_gsmopen/Makefile
-+++ b/src/mod/endpoints/mod_gsmopen/Makefile
-@@ -1,5 +1,15 @@
-+BASE=../../../..
- MODNAME=mod_gsmopen
--LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
--LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme
-+SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"'
-+
-+TIFF_DIR="$(shell ls -d $(switch_srcdir)/libs/tiff*)"
-+TIFF_BUILDDIR=$(TIFF_DIR)
-+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
-+
-+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
-+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
-+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
-+LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(TIFF_DIR)/libtiff -I$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/include -fpermissive
-+LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lspandsp -L$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib -lctb-0.16
- LOCAL_OBJS=gsmopen_protocol.o
- include ../../../../build/modmake.rules
+++ /dev/null
---- a/src/mod/event_handlers/mod_snmp/Makefile
-+++ b/src/mod/event_handlers/mod_snmp/Makefile
-@@ -1,7 +1,10 @@
--include ../../../../build/modmake.rules
-+BASE=../../../..
-+
-+include $(BASE)/build/modmake.rules
-+include $(BASE)/build/openwrt_rules.mk
-+
-+LOCAL_CFLAGS=$(shell $(STAGING_DIR)/host/bin/net-snmp-config --cflags --agent-libs) -DNETSNMP_NO_INLINE
-
--LOCAL_CFLAGS=`net-snmp-config --cflags`
--LOCAL_LDFLAGS=`net-snmp-config --agent-libs`
- LOCAL_OBJS=subagent.o
-
- local_depend: $(LOCAL_OBJS)
+++ /dev/null
---- a/src/mod/xml_int/mod_xml_ldap/Makefile
-+++ b/src/mod/xml_int/mod_xml_ldap/Makefile
-@@ -14,7 +14,7 @@ LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LI
-
- include $(BASE)/build/modmake.rules
-
--DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
-+DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb --with-yielding_select=yes
-
- $(LDAP_DIR):
- $(GETLIB) $(LDAP).tar.gz
+++ /dev/null
---- a/src/mod/xml_int/mod_xml_rpc/Makefile
-+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
-@@ -14,7 +14,6 @@ $(XMLRPC_DIR)/lib/abyss/src/date.o\
- $(XMLRPC_DIR)/src/double.o\
- $(XMLRPC_DIR)/lib/libutil/error.o\
- $(XMLRPC_DIR)/lib/abyss/src/file.o\
--$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\
- $(XMLRPC_DIR)/lib/util/getoptx.o\
- $(XMLRPC_DIR)/lib/abyss/src/handler.o\
- $(XMLRPC_DIR)/lib/abyss/src/http.o\
+++ /dev/null
---- a/src/mod/codecs/mod_isac/typedefs.h
-+++ b/src/mod/codecs/mod_isac/typedefs.h
-@@ -66,7 +66,7 @@
- #define WEBRTC_ARCH_X86
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
--#elif defined(__ARMEL__)
-+#elif defined(__ARMEL__) || defined(__mips__)
- // TODO(andrew): We'd prefer to control platform defines here, but this is
- // currently provided by the Android makefiles. Commented to avoid duplicate
- // definition warnings.
+++ /dev/null
---- a/src/mod/endpoints/mod_dingaling/Makefile
-+++ b/src/mod/endpoints/mod_dingaling/Makefile
-@@ -10,7 +10,6 @@ DING_DIR=$(BASE)/libs/libdingaling
- LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
- LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
- LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h
--LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
- include $(BASE)/build/modmake.rules
-
-
projects / feed / telephony.git / commitdiff