diff options
| author | Mazi Lo | 2014-10-26 14:56:06 +0000 |
|---|---|---|
| committer | Mazi Lo | 2014-10-26 14:56:06 +0000 |
| commit | 1fd4c936c6991e47d5c3f9abe55d9905f6eecf69 (patch) | |
| tree | aa7f00029ad459826c6bfc51d8c721280ddc25e7 | |
| parent | cc7c560f55acc9951eecd4acd80a5dcc32d32142 (diff) | |
| download | telephony-1fd4c936c6991e47d5c3f9abe55d9905f6eecf69.tar.gz | |
FreeSWITCH:
1. The included patched file (1130800-libs-srtp-configure-ac.patch) did
not seem to get pushed to the git server. Here we try again.
2. Update the patches/0000011-Makefile.am.patch file.
Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
| -rw-r--r-- | net/freeswitch/patches/0000011-Makefile.am.patch | 2 | ||||
| -rw-r--r-- | net/freeswitch/patches/1130800-libs-srtp-configure-ac.patch | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/freeswitch/patches/0000011-Makefile.am.patch b/net/freeswitch/patches/0000011-Makefile.am.patch index 4226046..7814d85 100644 --- a/net/freeswitch/patches/0000011-Makefile.am.patch +++ b/net/freeswitch/patches/0000011-Makefile.am.patch @@ -30,7 +30,7 @@ freeswitch_SOURCES = src/switch.c freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) -freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir) -+freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread ++freeswitch_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) -lpthread freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la if HAVE_ODBC diff --git a/net/freeswitch/patches/1130800-libs-srtp-configure-ac.patch b/net/freeswitch/patches/1130800-libs-srtp-configure-ac.patch index 01e63e0..6fbfeb5 100644 --- a/net/freeswitch/patches/1130800-libs-srtp-configure-ac.patch +++ b/net/freeswitch/patches/1130800-libs-srtp-configure-ac.patch @@ -5,11 +5,13 @@ AC_MSG_RESULT($enable_kernel_linux) -dnl Check for /dev/urandom +-AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom, +- [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)]) + +dnl Check for /dev/urandom ONLY when NOT cross compiling +if test "$cross_compiling" != yes; then - AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom, - [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)]) ++ AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom, ++ [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)]) +fi dnl Checks for header files. |