24f45c9b31
1. Update to FS git 6eb59c711989774fb797d1c447e3d63aac84826b. 2. Disable mod_perl due to recent changes in perl package. 3. Disable mod_verto (required mod_perl). 4. Remove numbering scheme from patches. Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
57 lines
2.2 KiB
Diff
57 lines
2.2 KiB
Diff
--- 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
|
|
@@ -172,7 +176,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)
|
|
@@ -311,7 +314,7 @@ endif
|
|
$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/modules.conf
|
|
|
|
src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
|
|
- cat $(switch_srcdir)/src/include/switch_cpp.h | perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
|
|
+ cat $(switch_srcdir)/src/include/switch_cpp.h | $(STAGING_DIR)/../host/usr/bin/perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
|
|
# $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h \
|
|
# -I$(switch_srcdir)/src/include -I$(switch_srcdir)/libs/libteletone/src \
|
|
# -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= \
|
|
@@ -374,7 +377,7 @@ fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthrea
|
|
nodist_freeswitch_SOURCES = src/include/switch_version.h
|
|
freeswitch_SOURCES = src/switch.c
|
|
freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
|
|
-freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
|
|
+freeswitch_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) -lpthread
|
|
freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
|
|
|
|
if HAVE_ODBC
|
|
@@ -633,7 +636,9 @@ sndfile-reconf:
|
|
|
|
tiff-reconf:
|
|
cd libs/tiff-4.0.2 && autoreconf -fi
|
|
- cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS)
|
|
+ cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr"
|
|
+ cd libs/spandsp && autoreconf -fi
|
|
+ cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr"
|
|
cd libs/tiff-4.0.2 && make
|
|
|
|
python-reconf:
|
|
@@ -658,9 +663,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 $(MY_DEFAULT_ARGS)
|
|
cd libs/spandsp && $(MAKE)
|
|
|
|
sofia-reconf:
|