1. Updated to git HEAD 7a46fd67cd2833f07d583288b8d2dc084733fc91 (v1.9.0)
2. Updated patched files. 3. Fixed detection of perl and python3 in configure.ac file Signed-off-by: Mazi Lo <openwrt.mazilo@xoxy.net>
This commit is contained in:
Habibie
parent
f9916da3bb
commit
16a9cf8cd0
|
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/src/mod/endpoints/mod_verto/Makefile.am
|
||||||
|
+++ b/src/mod/endpoints/mod_verto/Makefile.am
|
||||||
|
@@ -9,19 +9,19 @@ mod_verto_la_LIBADD = $(switch_builddi
|
||||||
|
mod_verto_la_LDFLAGS = -avoid-version -module -no-undefined -shared
|
||||||
|
|
||||||
|
if HAVE_PERL
|
||||||
|
-#perldir = $(PERL_SITEDIR)
|
||||||
|
-noinst_LTLIBRARIES = MCAST.la
|
||||||
|
+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
|
||||||
|
+perl_LTLIBRARIES = MCAST.la
|
||||||
|
MCAST_la_SOURCES = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
|
||||||
|
MCAST_la_CFLAGS = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
|
||||||
|
MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
|
||||||
|
MCAST_la_CPPFLAGS = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
|
||||||
|
MCAST_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
|
||||||
|
|
||||||
|
-#install-data-local: perlmod-install
|
||||||
|
+install-data-local: perlmod-install
|
||||||
|
|
||||||
|
-#perlmod-install: install-perlLTLIBRARIES
|
||||||
|
-# install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
|
||||||
|
-# install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
|
||||||
|
+perlmod-install: install-perlLTLIBRARIES
|
||||||
|
+ install -d -m 755 $(DESTDIR)$(perldir)
|
||||||
|
+ install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
|
||||||
|
endif
|
||||||
|
|
||||||
|
mcast/esl_wrap.cpp:
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
--- a/src/mod/languages/mod_perl/Makefile.am
|
||||||
|
+++ b/src/mod/languages/mod_perl/Makefile.am
|
||||||
|
@@ -1,29 +1,27 @@
|
||||||
|
include $(top_srcdir)/build/modmake.rulesam
|
||||||
|
MODNAME=mod_perl
|
||||||
|
-PERL = perl
|
||||||
|
-PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
|
||||||
|
-PERL_LIBS =`perl -MConfig -e 'print $$Config{libs}'`
|
||||||
|
|
||||||
|
-perldir=$(prefix)/perl
|
||||||
|
+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
|
||||||
|
mod_LTLIBRARIES = mod_perl.la
|
||||||
|
perl_LTLIBRARIES = freeswitch.la
|
||||||
|
mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
||||||
|
-mod_perl_la_CFLAGS = $(SWITCH_AM_CFLAGS)
|
||||||
|
-mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
|
||||||
|
-mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+mod_perl_la_CFLAGS = $(SWITCH_AM_CFLAGS) @PERL_INC@
|
||||||
|
+mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) @PERL_INC@
|
||||||
|
+mod_perl_la_CPPFLAGS = @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la
|
||||||
|
-mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
|
||||||
|
+mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared @PERL_LDFLAGS@ @PERL_LIBS@
|
||||||
|
|
||||||
|
freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
||||||
|
freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
|
||||||
|
-freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+
|
||||||
|
reswig: swigclean mod_perl_wrap.cpp
|
||||||
|
|
||||||
|
swigclean: clean
|
||||||
|
rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
|
||||||
|
|
||||||
|
mod_perl_wrap.cpp:
|
||||||
|
- swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
|
||||||
|
+ ${STAGING_DIR_HOSTPKG}/bin/swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
|
||||||
|
echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
|
||||||
|
patch -s -p0 -i hack.diff
|
||||||
|
|
||||||
|
@@ -31,7 +29,7 @@ orig: mod_perl_wrap.cpp
|
||||||
|
patch -R -s -p0 -i hack.diff
|
||||||
|
|
||||||
|
.perlok:
|
||||||
|
- @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
|
||||||
|
+ @(@PERL@ -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
|
||||||
|
|| ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
|
||||||
|
@touch .perlok
|
||||||
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
--- a/src/mod/endpoints/mod_verto/Makefile.am
|
||||||
|
+++ b/src/mod/endpoints/mod_verto/Makefile.am
|
||||||
|
@@ -9,19 +9,19 @@ mod_verto_la_LIBADD = $(switch_builddi
|
||||||
|
mod_verto_la_LDFLAGS = -avoid-version -module -no-undefined -shared
|
||||||
|
|
||||||
|
if HAVE_PERL
|
||||||
|
-#perldir = $(PERL_SITEDIR)
|
||||||
|
-noinst_LTLIBRARIES = MCAST.la
|
||||||
|
+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
|
||||||
|
+perl_LTLIBRARIES = MCAST.la
|
||||||
|
MCAST_la_SOURCES = mcast/mcast_wrap.cpp mcast/perlxsi.c mcast/mcast.c mcast/mcast_cpp.cpp
|
||||||
|
MCAST_la_CFLAGS = $(CC_CFLAGS) $(CFLAGS) $(SWITCH_AM_CFLAGS) $(PERL_CFLAGS)
|
||||||
|
MCAST_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) $(CXXFLAGS) -w $(PERL_INC)
|
||||||
|
MCAST_la_CPPFLAGS = -I$(switch_srcdir)/src/mod/endpoints/mod_verto/mcast
|
||||||
|
MCAST_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PERL_LDFLAGS)
|
||||||
|
|
||||||
|
-#install-data-local: perlmod-install
|
||||||
|
+install-data-local: perlmod-install
|
||||||
|
|
||||||
|
-#perlmod-install: install-perlLTLIBRARIES
|
||||||
|
-# install -d -m 755 $(DESTDIR)$(PERL_SITEDIR)
|
||||||
|
-# install -m 755 mcast/MCAST.pm $(DESTDIR)$(PERL_SITEDIR)
|
||||||
|
+perlmod-install: install-perlLTLIBRARIES
|
||||||
|
+ install -d -m 755 $(DESTDIR)$(perldir)
|
||||||
|
+ install -m 755 mcast/MCAST.pm $(DESTDIR)$(perldir)
|
||||||
|
endif
|
||||||
|
|
||||||
|
mcast/esl_wrap.cpp:
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
--- a/src/mod/languages/mod_perl/Makefile.am
|
||||||
|
+++ b/src/mod/languages/mod_perl/Makefile.am
|
||||||
|
@@ -1,29 +1,27 @@
|
||||||
|
include $(top_srcdir)/build/modmake.rulesam
|
||||||
|
MODNAME=mod_perl
|
||||||
|
-PERL = perl
|
||||||
|
-PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE
|
||||||
|
-PERL_LIBS =`perl -MConfig -e 'print $$Config{libs}'`
|
||||||
|
|
||||||
|
-perldir=$(prefix)/perl
|
||||||
|
+perldir = /usr/lib/perl5/@PERL_VERSION@/CORE
|
||||||
|
mod_LTLIBRARIES = mod_perl.la
|
||||||
|
perl_LTLIBRARIES = freeswitch.la
|
||||||
|
mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
||||||
|
-mod_perl_la_CFLAGS = $(SWITCH_AM_CFLAGS)
|
||||||
|
-mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
|
||||||
|
-mod_perl_la_CPPFLAGS = -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+mod_perl_la_CFLAGS = $(SWITCH_AM_CFLAGS) @PERL_INC@
|
||||||
|
+mod_perl_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS) @PERL_INC@
|
||||||
|
+mod_perl_la_CPPFLAGS = @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la
|
||||||
|
-mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'`
|
||||||
|
+mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared @PERL_LDFLAGS@ @PERL_LIBS@
|
||||||
|
|
||||||
|
freeswitch_la_SOURCES = freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c
|
||||||
|
freeswitch_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(LDFLAGS)
|
||||||
|
-freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) -w -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+freeswitch_la_CPPFLAGS = $(SWITCH_AM_CPPFLAGS) @PERL_CFLAGS@ -I$(switch_srcdir)/libs/libteletone/src/
|
||||||
|
+
|
||||||
|
reswig: swigclean mod_perl_wrap.cpp
|
||||||
|
|
||||||
|
swigclean: clean
|
||||||
|
rm -f mod_perl_wrap.* freeswitch.so freeswitch.pm
|
||||||
|
|
||||||
|
mod_perl_wrap.cpp:
|
||||||
|
- swig2.0 -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
|
||||||
|
+ ${STAGING_DIR_HOSTPKG}/bin/swig -static -shadow -perl5 -c++ -DMULTIPLICITY -I../../../../src/include -o mod_perl_wrap.cpp freeswitch.i
|
||||||
|
echo "#include \"mod_perl_extra.c\"" >> mod_perl_wrap.cpp
|
||||||
|
patch -s -p0 -i hack.diff
|
||||||
|
|
||||||
|
@@ -31,7 +29,7 @@ orig: mod_perl_wrap.cpp
|
||||||
|
patch -R -s -p0 -i hack.diff
|
||||||
|
|
||||||
|
.perlok:
|
||||||
|
- @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
|
||||||
|
+ @(@PERL@ -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
|
||||||
|
|| ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
|
||||||
|
@touch .perlok
|
||||||
|
|
||||||
Loading…
Reference in New Issue