From fec346da37ce27b4a27f751425980126114bd3ca Mon Sep 17 00:00:00 2001 From: Mazi Lo Date: Tue, 23 Jan 2018 08:22:52 -0500 Subject: [PATCH] Fixed to use local python3-package.mk Signed-off-by: Mazi Lo --- net/freeswitch/Config.in | 4 +- net/freeswitch/Makefile | 35 +++--- net/freeswitch/patches/musl/Makefile_am.patch | 6 +- .../patches/musl/build-modules_conf_in.patch | 2 +- .../patches/musl/configure_ac.patch | 101 ++++++++++++------ ...autoload_configs-http_cache_conf_xml.patch | 7 +- ...mod-languages-mod_python-Makefile_am.patch | 11 +- .../patches/uClibc/Makefile_am.patch | 6 +- .../uClibc/build-modules_conf_in.patch | 2 +- .../patches/uClibc/configure_ac.patch | 101 ++++++++++++------ ...autoload_configs-http_cache_conf_xml.patch | 7 +- ...mod-languages-mod_python-Makefile_am.patch | 11 +- 12 files changed, 198 insertions(+), 95 deletions(-) diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in index 7f869df..ec254db 100644 --- a/net/freeswitch/Config.in +++ b/net/freeswitch/Config.in @@ -241,7 +241,7 @@ menu "Configuration" depends on PACKAGE_freeswitch-mod-erlang-event string prompt "path to erlang installed directory" - default "$$(STAGING_DIR)/host/lib/erlang" + default "$$(STAGING_DIR_HOSTPKG)/lib/erlang" help Specify the path to erlang libraries. @@ -262,7 +262,7 @@ menu "Configuration" depends on FS_WITH_PYTHON string prompt "full path to binary python$(PYTHON3_VERSION)" - default "$$(STAGING_DIR)/host/bin/python$(PYTHON3_VERSION)" + default "$$(STAGING_DIR_HOSTPKG)/bin/python$(PYTHON3_VERSION)" help Specify the full path to binary python$(PYTHON3-VERSION). diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index e3b09da..c9c171a 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -8,15 +8,10 @@ include $(TOPDIR)/rules.mk -ifneq ($(PACKAGE_$(PKG_NAME)-mod-perl),) -include $(TOPDIR)/feeds/packages/lang/perl/perlmod.mk -endif - - PKG_NAME:=freeswitch PKG_SOURCE_PROTO:=git PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO) -PKG_VERSION:=1.7.0 +PKG_VERSION:=1.9.0 # @@ -27,7 +22,7 @@ PKG_SOURCE_URL:=https://$(PKG_NAME).org/stash/scm/fs/$(PKG_NAME).git PATCH_DIR:=./patches/$(CONFIG_LIBC) -FS_WITH_DEFAULT_HEAD:=cc0a062204cb51311619cd37f51b32b2f266729f +FS_WITH_DEFAULT_HEAD:=7f9e6f3e4b174d7c9e7455d0e3e7b475bb2c1818 FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7) PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1),$(FS_WITH_DEFAULT_HEAD)) PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7) @@ -40,8 +35,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR) +PKG_BUILD_DEPENDS:=swig/host PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=0 +PKG_USE_MIPS16:=0 PKG_LICENSE:=MPL-1.1 @@ -244,8 +241,11 @@ PKG_CONFIG_DEPENDS:= \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +include $(TOPDIR)/feeds/packages/lang/perl/perlmod.mk + + ifneq ($(CONFIG_FS_WITH_PYTHON),) -$(call include_mk, python3-package.mk) +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk endif @@ -260,7 +260,7 @@ define Package/$(PKG_NAME)/Default CATEGORY:=Network SUBMENU:=Telephony URL:=http://www.$(PKG_NAME).org/ - MAINTAINER:=Mazi Lo + MAINTAINER:=Mazi Lo endef @@ -340,9 +340,7 @@ define Package/$(PKG_NAME)-collection-upstream-defaults $(call Package/$(PKG_NAME)/Default) TITLE:=FS upstream def sample conf DEPENDS:= $(PKG_NAME) \ - +$(PKG_NAME)-config-upstream-defaults \ +$(PKG_NAME)-mod-callcenter \ - +$(PKG_NAME)-mod-codec2 \ +$(PKG_NAME)-mod-commands \ +$(PKG_NAME)-mod-conference \ +$(PKG_NAME)-mod-curl \ @@ -354,7 +352,6 @@ define Package/$(PKG_NAME)-collection-upstream-defaults +$(PKG_NAME)-mod-g729 \ +$(PKG_NAME)-mod-hash \ +$(PKG_NAME)-mod-http-cache \ - +$(PKG_NAME)-mod-ilbc \ +$(PKG_NAME)-mod-local-stream \ +$(PKG_NAME)-mod-lua \ +$(PKG_NAME)-mod-native-file \ @@ -375,7 +372,6 @@ define Package/$(PKG_NAME)-collection-minimal DEFAULT:=y DEPENDS:= $(PKG_NAME) \ +$(PKG_NAME)-config-minimal \ - +$(PKG_NAME)-mod-codec2 \ +$(PKG_NAME)-mod-commands \ +$(PKG_NAME)-mod-dialplan-xml \ +$(PKG_NAME)-mod-dptools \ @@ -595,7 +591,6 @@ CONFIGURE_ARGS+= \ $(call autoconf_bool,CONFIG_FS_WITH_APR_THREADS,threads) \ $(call autoconf_bool,CONFIG_FS_WITH_VISIBILITY,visibility) \ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \ - $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-timerfd,timerfd-wrapper) \ $(if $(CONFIG_FS_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ $(if $(CONFIG_FS_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ @@ -894,12 +889,14 @@ define BuildPlugin define Package/$(PKG_NAME)-mod-$(1)/postinst #!/bin/sh -sed -i -e 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml +sed -i -e 's#[^ \t]\(,*\)\(.*\)"mod_console"/>\(.*\)$$$$#\1#g' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml +exit 0 endef define Package/$(PKG_NAME)-mod-$(1)/prerm #!/bin/sh -sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1|' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml +sed -i -e 's#[^ \t]\(,*\)\(.*\)"mod_console"/>\(.*\)$$$$#\1#g' $$$${IPKG_INSTROOT}/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml +exit 0 endef $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1))) @@ -1006,7 +1003,7 @@ $(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,)) $(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,+libopus)) $(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,)) $(eval $(call BuildPlugin,png,play a png as video with audio,vanilla,,,,+libpng)) -$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/$(PERL_VERSION)/$(PKG_NAME).la lib/perl5/$(PERL_VERSION)/$(PKG_NAME).pm lib/perl5/$(PERL_VERSION)/$(PKG_NAME).so,,+perl +libdb47 +libgdbm @BROKEN)) +$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).la lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).pm lib/perl5/$(PERL_VERSION)/CORE/$(PKG_NAME).so,,+perl +libdb47 +libgdbm)) $(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio $(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio $(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,)) @@ -1045,7 +1042,7 @@ $(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp)) $(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,)) $(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf $(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,)) -$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +FS_WITH_LZMA:liblzma @FS_WITH_LZMA)) # ~/conf +$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +FS_WITH_LZMA:liblzma @FS_WITH_LZMA +libtiff)) # ~/conf $(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js $(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN)) $(eval $(call BuildPlugin,spidermonkey-curl,JavaScript Curl,vanilla,,,,@BROKEN)) @@ -1062,7 +1059,7 @@ $(eval $(call BuildPlugin,translate,Translate,vanilla,,,,)) $(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,)) $(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN)) $(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,)) -$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/$(PERL_VERSION)/MCAST.so lib/perl5/$(PERL_VERSION)/MCAST.la lib/perl5/$(PERL_VERSION)/MCAST.pm,perl rtc,+perl @BROKEN)) +$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/$(PERL_VERSION)/CORE/MCAST.la lib/perl5/$(PERL_VERSION)/CORE/MCAST.pm lib/perl5/$(PERL_VERSION)/CORE/MCAST.so,perl rtc,+perl)) $(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,)) $(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,)) $(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,)) diff --git a/net/freeswitch/patches/musl/Makefile_am.patch b/net/freeswitch/patches/musl/Makefile_am.patch index 6689883..d08c6a1 100644 --- a/net/freeswitch/patches/musl/Makefile_am.patch +++ b/net/freeswitch/patches/musl/Makefile_am.patch @@ -1,11 +1,11 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -533,7 +533,7 @@ libs/libzrtp/libzrtp.a: +@@ -559,7 +559,7 @@ libs/libzrtp/libzrtp.a: cd libs/libzrtp && $(MAKE) libs/libvpx/Makefile: -- cd libs/libvpx && CC=$(CC) CXX=$(CXX) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="-fvisibility=hidden" -+ cd libs/libvpx && CC=$(CC) CXX=$(CXX) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS=$(ARCH)-openwrt-linux LD=$(CXX) ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="-fvisibility=hidden" +- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" ++ cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS="$(ARCH)-openwrt-linux LD=$(CXX)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" libs/libvpx/libvpx.a: libs/libvpx/Makefile @cd libs/libvpx && $(MAKE) diff --git a/net/freeswitch/patches/musl/build-modules_conf_in.patch b/net/freeswitch/patches/musl/build-modules_conf_in.patch index 86aad26..8fee317 100644 --- a/net/freeswitch/patches/musl/build-modules_conf_in.patch +++ b/net/freeswitch/patches/musl/build-modules_conf_in.patch @@ -6,5 +6,5 @@ #applications/mod_rss +#applications/mod_skel applications/mod_sms + #applications/mod_sms_flowroute #applications/mod_snapshot - #applications/mod_snom diff --git a/net/freeswitch/patches/musl/configure_ac.patch b/net/freeswitch/patches/musl/configure_ac.patch index a69a12b..1a1c88c 100644 --- a/net/freeswitch/patches/musl/configure_ac.patch +++ b/net/freeswitch/patches/musl/configure_ac.patch @@ -21,17 +21,18 @@ export apr_cv_mutex_robust_shared=yes ;; esac -@@ -409,9 +409,6 @@ elif test "x${ax_cv_c_compiler_vendor}" - APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) - APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) +@@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}" + APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math) AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99]) # FS-8809, needed for MAP_POPULATE - if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then - APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) +- APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result) - fi - if test "${enable_64}" = "yes"; then - case "$host" in - *darwin*) -@@ -912,7 +909,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa + if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then + APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation) + fi +@@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) @@ -39,48 +40,73 @@ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ -@@ -1487,16 +1483,16 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun +@@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun # perl checks # -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no]) -+AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/host/usr/bin]) +- +-# -a "x$ac_cv_have_EXTERN_h" != "xno" ++AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin]) +PERL=$as_dir/$ac_word$ac_exec_ext - # -a "x$ac_cv_have_EXTERN_h" != "xno" - - if test "x$ac_cv_have_perl" != "xno"; then +-if test "x$ac_cv_have_perl" != "xno"; then - PERL=perl - PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`" - PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE" -+ PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`" -+ PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/CORE" - PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`" +- PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`" - PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL" -+ PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's| -I/usr/local/include||g'` -DEMBED_PERL" - PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`" - PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`" +- PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`" +- PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`" ++if test "x$ac_cv_prog_PERL" != "xno"; then ++ PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`" ++ PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`" ++ PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`" ++ PERL_LIBDIR="-L$PERL_SITEDIR/CORE" ++ PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`" ++ PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL" ++ PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`" ++ PERL_INC="-I$PERL_SITEDIR/CORE" -@@ -1511,6 +1507,7 @@ if test "x$ac_cv_have_perl" != "xno"; th - AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no) + save_CFLAGS="$CFLAGS" + CFLAGS="$PERL_CFLAGS" +@@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th + + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$PERL_LDFLAGS" +- AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no) ++ AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no]) LDFLAGS="$save_LDFLAGS" + AC_SUBST(PERL) AC_SUBST(PERL_SITEDIR) ++ AC_SUBST(PERL_SITEDIR_LOCAL) AC_SUBST(PERL_LIBDIR) AC_SUBST(PERL_LIBS) -@@ -1526,16 +1523,16 @@ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_c + AC_SUBST(PERL_CFLAGS) + AC_SUBST(PERL_LDFLAGS) + AC_SUBST(PERL_INC) ++ AC_SUBST(PERL_VERSION) + fi + +-AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"]) ++AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"]) ++#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"]) + + # + # php checks # AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no]) -AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no]) -+AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/host/usr/bin]) ++dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin]) ++AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin]) AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"]) if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then PHP=php - PHP_CONFIG=php-config -+ PHP_CONFIG=${STAGING_DIR}/host/usr/bin/php-config ++ PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config PHP_LDFLAGS="`$PHP_CONFIG --ldflags`" PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`" PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`" @@ -89,12 +115,21 @@ PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`" PHP_CFLAGS="`$PHP_CONFIG --includes`" AC_SUBST(PHP_LDFLAGS) -@@ -1569,12 +1566,12 @@ then +@@ -1623,7 +1623,7 @@ fi + # Python checks for mod_python + # + AC_ARG_WITH( +- [python], ++ [python3], + [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])], + [with_python="$withval"], + [with_python="try"] +@@ -1642,17 +1642,18 @@ then AC_MSG_RESULT([$with_python]) AC_SUBST([PYTHON], ["$with_python"]) else - AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) -+ AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["$PATH:${STAGING_DIR}/host/bin:/usr/bin:/usr/local/bin"]) ++ AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"]) fi if test "$PYTHON" != "no" ; then @@ -104,13 +139,19 @@ if test -z "$PYTHON_VER" ; then AC_MSG_ERROR([Unable to detect python version]) -@@ -1593,12 +1590,12 @@ then + fi + AC_MSG_RESULT([$PYTHON_VER]) ++ AC_SUBST([PYTHON_VER], [$PYTHON_VER]) + + AC_MSG_CHECKING([for python distutils]) + python_result="`$PYTHON -c 'import distutils;' 2>&1`" +@@ -1666,12 +1667,12 @@ then if test "$python_has_distutils" != "no" ; then AC_MSG_CHECKING([location of site-packages]) - PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" + if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then -+ PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));' | sed -e 's|\(^.*\)/host|/usr|g'`" ++ PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" - if test -z "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Unable to detect python site-packages path]) @@ -122,16 +163,16 @@ fi AC_MSG_RESULT([$PYTHON_SITE_DIR]) AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) -@@ -1606,10 +1603,10 @@ then +@@ -1679,10 +1680,10 @@ then # # python distutils found, get settings from python directly # - PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`" -+ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's|host|usr|g'`" ++ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`" PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`" PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`" - PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`" -+ PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|host|usr|g'`" ++ PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`" # handle python being installed into /usr/local AC_MSG_CHECKING([python libdir]) diff --git a/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch b/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch index d1a6715..27f1b5f 100644 --- a/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch +++ b/net/freeswitch/patches/musl/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch @@ -1,11 +1,14 @@ --- a/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml +++ b/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml -@@ -9,7 +9,7 @@ +@@ -9,9 +9,9 @@ -- + + +- ++ diff --git a/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch b/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch index 7ce0878..185006e 100644 --- a/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch +++ b/net/freeswitch/patches/musl/src-mod-languages-mod_python-Makefile_am.patch @@ -1,11 +1,20 @@ --- a/src/mod/languages/mod_python/Makefile.am +++ b/src/mod/languages/mod_python/Makefile.am +@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rule + MODNAME=mod_python + + PYMOD=freeswitch +-PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ ++PYTHON_SITE_DIR=/usr/lib/python@PYTHON_VER@/site-packages + + SWIGCFILE=../../../switch_swig.c + SWIGIFILE=../../../switch_swig.i @@ -20,7 +20,7 @@ swigclean: clean rm -f mod_python_wrap.* freeswitch.py mod_python_wrap.cpp: mod_python_extra.c hack.diff - swig2.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i -+ ${STAGING_DIR}/host/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i ++ ${STAGING_DIR_HOSTPKG}/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp patch -s -p0 -i hack.diff diff --git a/net/freeswitch/patches/uClibc/Makefile_am.patch b/net/freeswitch/patches/uClibc/Makefile_am.patch index 6689883..d08c6a1 100644 --- a/net/freeswitch/patches/uClibc/Makefile_am.patch +++ b/net/freeswitch/patches/uClibc/Makefile_am.patch @@ -1,11 +1,11 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -533,7 +533,7 @@ libs/libzrtp/libzrtp.a: +@@ -559,7 +559,7 @@ libs/libzrtp/libzrtp.a: cd libs/libzrtp && $(MAKE) libs/libvpx/Makefile: -- cd libs/libvpx && CC=$(CC) CXX=$(CXX) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="-fvisibility=hidden" -+ cd libs/libvpx && CC=$(CC) CXX=$(CXX) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS=$(ARCH)-openwrt-linux LD=$(CXX) ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="-fvisibility=hidden" +- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" ++ cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CROSS="$(ARCH)-openwrt-linux LD=$(CXX)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" libs/libvpx/libvpx.a: libs/libvpx/Makefile @cd libs/libvpx && $(MAKE) diff --git a/net/freeswitch/patches/uClibc/build-modules_conf_in.patch b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch index 86aad26..8fee317 100644 --- a/net/freeswitch/patches/uClibc/build-modules_conf_in.patch +++ b/net/freeswitch/patches/uClibc/build-modules_conf_in.patch @@ -6,5 +6,5 @@ #applications/mod_rss +#applications/mod_skel applications/mod_sms + #applications/mod_sms_flowroute #applications/mod_snapshot - #applications/mod_snom diff --git a/net/freeswitch/patches/uClibc/configure_ac.patch b/net/freeswitch/patches/uClibc/configure_ac.patch index a69a12b..1a1c88c 100644 --- a/net/freeswitch/patches/uClibc/configure_ac.patch +++ b/net/freeswitch/patches/uClibc/configure_ac.patch @@ -21,17 +21,18 @@ export apr_cv_mutex_robust_shared=yes ;; esac -@@ -409,9 +409,6 @@ elif test "x${ax_cv_c_compiler_vendor}" - APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) - APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) +@@ -419,10 +419,6 @@ elif test "x${ax_cv_c_compiler_vendor}" + APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC -ffast-math) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC -ffast-math) AC_SUBST([AM_MOD_AVMD_CXXFLAGS], [-std=gnu99]) # FS-8809, needed for MAP_POPULATE - if test "$ac_cv_gcc_supports_w_no_unused_result" = yes; then - APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) +- APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result) - fi - if test "${enable_64}" = "yes"; then - case "$host" in - *darwin*) -@@ -912,7 +909,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa + if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then + APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation) + fi +@@ -948,7 +944,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) @@ -39,48 +40,73 @@ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ -@@ -1487,16 +1483,16 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun +@@ -1560,18 +1555,18 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun # perl checks # -AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no]) -+AC_CHECK_PROG(PERL,[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/host/usr/bin]) +- +-# -a "x$ac_cv_have_EXTERN_h" != "xno" ++AC_CHECK_PROG(PERL,[perl],[yes],[no],[${STAGING_DIR_HOSTPKG}/usr/bin]) +PERL=$as_dir/$ac_word$ac_exec_ext - # -a "x$ac_cv_have_EXTERN_h" != "xno" - - if test "x$ac_cv_have_perl" != "xno"; then +-if test "x$ac_cv_have_perl" != "xno"; then - PERL=perl - PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`" - PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE" -+ PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlibexp}'`" -+ PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlibexp}'`/CORE" - PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`" +- PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`" - PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL" -+ PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's| -I/usr/local/include||g'` -DEMBED_PERL" - PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`" - PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`" +- PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`" +- PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`" ++if test "x$ac_cv_prog_PERL" != "xno"; then ++ PERL_VERSION="`$PERL -e 'print substr($^V, 1)' | cut -d. -f1,2`" ++ PERL_SITEDIR_LOCAL="`$PERL -MConfig -e 'print $Config{archlibexp}'`" ++ PERL_SITEDIR="`find ${STAGING_DIR}/usr -name $PERL_VERSION -print`" ++ PERL_LIBDIR="-L$PERL_SITEDIR/CORE" ++ PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}' | sed -e 's|-lnsl ||g;s| -lgdbm_compat||g'`" ++ PERL_CFLAGS="-w -DMULTIPLICITY -D_REENTRANT -D_GNU_SOURCE -DPERL_USE_SAFE_PUTENV `$PERL -MExtUtils::Embed -e ccopts | sed -e \"s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s| -I/usr/local/include||g\"` -DEMBED_PERL" ++ PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e \"s| $PERL_SITEDIR_LOCAL/auto/NDBM_File/NDBM_File.a||g;s| $PERL_SITEDIR_LOCAL/auto/ODBM_File/ODBM_File.a||g;s|$PERL_SITEDIR_LOCAL|$PERL_SITEDIR|g;s|.a |.so |g;s|-lnsl ||g;s|-lgdbm_compat ||g;s|/usr/local|${STAGING_DIR}/usr|g\"`" ++ PERL_INC="-I$PERL_SITEDIR/CORE" -@@ -1511,6 +1507,7 @@ if test "x$ac_cv_have_perl" != "xno"; th - AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no) + save_CFLAGS="$CFLAGS" + CFLAGS="$PERL_CFLAGS" +@@ -1581,34 +1576,39 @@ if test "x$ac_cv_have_perl" != "xno"; th + + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$PERL_LDFLAGS" +- AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no) ++ AC_CHECK_LIB([perl], [perl_alloc], [ac_cv_use_libperl=yes], [ac_cv_use_libperl=no]) LDFLAGS="$save_LDFLAGS" + AC_SUBST(PERL) AC_SUBST(PERL_SITEDIR) ++ AC_SUBST(PERL_SITEDIR_LOCAL) AC_SUBST(PERL_LIBDIR) AC_SUBST(PERL_LIBS) -@@ -1526,16 +1523,16 @@ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_c + AC_SUBST(PERL_CFLAGS) + AC_SUBST(PERL_LDFLAGS) + AC_SUBST(PERL_INC) ++ AC_SUBST(PERL_VERSION) + fi + +-AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"]) ++AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" = "xyes" -a "x$ac_cv_have_EXTERN_h" = "xyes" -a "x$ac_cv_use_libperl" = "xyes"]) ++#AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_prog_PERL" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno"]) + + # + # php checks # AC_CHECK_PROG(PHP,php,[ac_cv_have_php=yes],[ac_cv_have_php=no]) -AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no]) -+AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/host/usr/bin]) ++dnl AC_CHECK_PROG(PHP_CONFIG,php-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin]) ++AC_CHECK_PROG(PHP_CONFIG,php7-config,[ac_cv_have_php_config=yes],[ac_cv_have_php_config=no],[${STAGING_DIR}/usr/bin]) AM_CONDITIONAL([HAVE_PHP],[test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"]) if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then PHP=php - PHP_CONFIG=php-config -+ PHP_CONFIG=${STAGING_DIR}/host/usr/bin/php-config ++ PHP_CONFIG=${STAGING_DIR}/usr/bin/php7-config PHP_LDFLAGS="`$PHP_CONFIG --ldflags`" PHP_LIBS="`$PHP_CONFIG --libs | sed -r 's/ ?-l(bz2|pcre|xml2|gssapi_krb5|krb5|k5crypto|com_err|history|z|readline|gmp|ssl|crypto)//g'`" PHP_EXT_DIR="`$PHP_CONFIG --extension-dir`" @@ -89,12 +115,21 @@ PHP_INI_DIR="`$PHP_CONFIG --configure-options | tr " " "\n" | grep -- --with-config-file-scan-dir | cut -f2 -d=`" PHP_CFLAGS="`$PHP_CONFIG --includes`" AC_SUBST(PHP_LDFLAGS) -@@ -1569,12 +1566,12 @@ then +@@ -1623,7 +1623,7 @@ fi + # Python checks for mod_python + # + AC_ARG_WITH( +- [python], ++ [python3], + [AS_HELP_STRING([--with-python], [Use system provided version of python (default: try)])], + [with_python="$withval"], + [with_python="try"] +@@ -1642,17 +1642,18 @@ then AC_MSG_RESULT([$with_python]) AC_SUBST([PYTHON], ["$with_python"]) else - AC_PATH_PROG([PYTHON], ["python"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) -+ AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["$PATH:${STAGING_DIR}/host/bin:/usr/bin:/usr/local/bin"]) ++ AC_PATH_PROG([PYTHON], ["python3"], ["no"], ["${STAGING_DIR_HOSTPKG}/bin"]) fi if test "$PYTHON" != "no" ; then @@ -104,13 +139,19 @@ if test -z "$PYTHON_VER" ; then AC_MSG_ERROR([Unable to detect python version]) -@@ -1593,12 +1590,12 @@ then + fi + AC_MSG_RESULT([$PYTHON_VER]) ++ AC_SUBST([PYTHON_VER], [$PYTHON_VER]) + + AC_MSG_CHECKING([for python distutils]) + python_result="`$PYTHON -c 'import distutils;' 2>&1`" +@@ -1666,12 +1667,12 @@ then if test "$python_has_distutils" != "no" ; then AC_MSG_CHECKING([location of site-packages]) - PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" + if test -d "`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" ; then -+ PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));' | sed -e 's|\(^.*\)/host|/usr|g'`" ++ PYTHON_SITE_DIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`" - if test -z "$PYTHON_SITE_DIR" ; then - AC_MSG_ERROR([Unable to detect python site-packages path]) @@ -122,16 +163,16 @@ fi AC_MSG_RESULT([$PYTHON_SITE_DIR]) AC_SUBST([PYTHON_SITE_DIR], [$PYTHON_SITE_DIR]) -@@ -1606,10 +1603,10 @@ then +@@ -1679,10 +1680,10 @@ then # # python distutils found, get settings from python directly # - PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`" -+ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's|host|usr|g'`" ++ PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));'`" PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print(\" \".join(libs));'`" PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print(\"python\" + sysconfig.get_config_var(\"VERSION\"));'`" - PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`" -+ PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|host|usr|g'`" ++ PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));' | sed -e 's|\(^.*\)/staging_dir/hostpkg|/${STAGING_DIR}/usr|g'`" # handle python being installed into /usr/local AC_MSG_CHECKING([python libdir]) diff --git a/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch b/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch index d1a6715..27f1b5f 100644 --- a/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch +++ b/net/freeswitch/patches/uClibc/src-mod-applications-mod_http_cache-conf-autoload_configs-http_cache_conf_xml.patch @@ -1,11 +1,14 @@ --- a/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml +++ b/src/mod/applications/mod_http_cache/conf/autoload_configs/http_cache.conf.xml -@@ -9,7 +9,7 @@ +@@ -9,9 +9,9 @@ -- + + +- ++ diff --git a/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch b/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch index 7ce0878..185006e 100644 --- a/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch +++ b/net/freeswitch/patches/uClibc/src-mod-languages-mod_python-Makefile_am.patch @@ -1,11 +1,20 @@ --- a/src/mod/languages/mod_python/Makefile.am +++ b/src/mod/languages/mod_python/Makefile.am +@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rule + MODNAME=mod_python + + PYMOD=freeswitch +-PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ ++PYTHON_SITE_DIR=/usr/lib/python@PYTHON_VER@/site-packages + + SWIGCFILE=../../../switch_swig.c + SWIGIFILE=../../../switch_swig.i @@ -20,7 +20,7 @@ swigclean: clean rm -f mod_python_wrap.* freeswitch.py mod_python_wrap.cpp: mod_python_extra.c hack.diff - swig2.0 -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i -+ ${STAGING_DIR}/host/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i ++ ${STAGING_DIR_HOSTPKG}/bin/swig -python -c++ -I../../../../src/include -oh mod_python_wrap.h -o mod_python_wrap.cpp mod_python.i echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp patch -s -p0 -i hack.diff