fixed endianess detection, submitted by Uwe Kleine-König

SVN-Revision: 35829

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index c2ca5630ad6fa2cbb14158d8cab9738c51986965..10f5d9cbd07935392682cc1588c79b46a8b526c8 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,7 +18,7 @@ PKG_VERSION:=1.3.13b
 #
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
-FS_DEFAULT_HEAD:=3e31837a0bb417a328d9877647bbb1bb2ed51b5f
+FS_DEFAULT_HEAD:=8258e782d47f4b01c4684b68ecce417298fbbebe
 FS_LATEST_HEAD:=$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1)
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD))
 PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
@@ -680,7 +680,7 @@ define Package/$(PKG_NAME)/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/
-       $(if $(1)/usr/lib/$b(PKG_NAME).la,sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $(1)/usr/lib/lib$(PKG_NAME).la)
+       $(if $(1)/usr/lib/lib$(PKG_NAME).la,$(SED) "s#-lcurl -lz\(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#-L/usr/lib -lcurl -lz /usr/lib/libexpat.la\2/usr\3#g" $(1)/usr/lib/lib$(PKG_NAME).la)
 endef
 
 
@@ -841,7 +841,7 @@ define BuildLib
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,$(3)).pc $$(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(1)* $$(1)/usr/lib/
-       $(if $$(1)/usr/lib/$(1).la,sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $$(1)/usr/lib/$(1).la)
+       $(if $$(1)/usr/lib/$(1).la,$(SED) "s#\(^.*\)=' \(.*\)-lm\(.*\)#\1=' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib -lm\3#g" $$(1)/usr/lib/$(1).la)
   endef
 
   $$(eval $$(call BuildPackage,$(PKG_NAME)-$(1)))
@@ -873,17 +873,16 @@ define BuildPlugin
        done
 
        #
-       # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH.
+       # mod_$(subst -,_,$(1)): $(5)
        #
-       for f in $$(1)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).la $$$$(wildcard $$(1)/usr/lib/$(PKG_NAME)/$(4)_*.la); \
-       do \
-               $$(if $$$$$$$${f},sed -i "s#$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)#/usr#g;s#$(TOOLCHAIN_DIR)/lib##g;s#$(TOOLCHAIN_DIR)##g;s#$(STAGING_DIR)##g;s#$(STAGING_DIR_HOST)##g;s#-L$(PKG_BUILD_DIR)/libs/libzrtp/third_party/bnlib -L$(PKG_BUILD_DIR)/libs/libzrtp ##g;s#-L$(PKG_BUILD_DIR)/libs/apr-util/xml/expat/lib ##g;s#$(PKG_BUILD_DIR)##g" $$$$$$$${f}); \
-       done
+       $(foreach f,$(5),[ -d $(dir $$(1)/usr/${f}) ] || $(INSTALL_DIR) $(dir $$(1)/usr/${f});$(CP) $(PKG_INSTALL_DIR)/usr/${f} $$(1)/usr;)
 
-       for f in $(5); \
+       #
+       # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH.
+       #
+       for f in `ls $$(1)/usr/lib/$(PKG_NAME)/*.la`; \
        do \
-               [ -d "$(dir $$(1)/usr/$(f))" ] || $(INSTALL_DIR) $(dir $$(1)/usr/$(f)); \
-               $(CP) $(PKG_INSTALL_DIR)/usr/$(f) $$(1)/usr/$(f); \
+               $(SED) "s#' \(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib /usr/lib/lib$(PKG_NAME).la /usr/lib/libexpat.la\2/usr\3#g;s#' \(.*\)/usr/lib/libintl-full/lib#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib#g;s#-L\.\.##g;s#$(PKG_BUILD_DIR)\(.*\)/usr/lib/libtiff.la\(.*\)#/usr/lib/libtiff.la\2#g" $$$$$$$${f}; \
        done
 
        #
@@ -919,12 +918,12 @@ define BuildPlugin
 
   define Package/$(PKG_NAME)-mod-$(1)/postinst
 #!/bin/sh
-sed -i -e 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
+$(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
   endef
 
   define Package/$(PKG_NAME)-mod-$(1)/postrm
 #!/bin/sh
-sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
+$(SED) 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml
   endef
 
   $$(eval $$(call BuildPackage,$(PKG_NAME)-mod-$(1)))

diff --git a/net/freeswitch/patches/003-Makefile.am.patch b/net/freeswitch/patches/003-Makefile.am.patch
index bd68475239012e4683a6c1599156134f341ee3a6..af128f9696585fdebcf5d1cfb0c6369871846b4e 100644 (file)
--- a/net/freeswitch/patches/003-Makefile.am.patch
+++ b/net/freeswitch/patches/003-Makefile.am.patch
@@ -8,7 +8,7 @@
  EXTRA_DIST =
  SUBDIRS = . src
  AUTOMAKE_OPTIONS = foreign
-@@ -165,7 +169,6 @@ ZRTP_LIBS = -lbn -lzrtp
+@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp
  libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
  libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
  CORE_LIBS += libs/libzrtp/libzrtp.a
@@ -16,7 +16,7 @@
  endif
  
  library_includedir      = $(includedir)
-@@ -423,7 +426,7 @@ $(switch_builddir)/quiet_libtool: $(swit
+@@ -422,7 +425,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
@@ -25,7 +25,7 @@
  
  src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
        @cat $< > $@; \
-@@ -649,7 +652,9 @@ sndfile-reconf:
+@@ -648,7 +651,9 @@ sndfile-reconf:
  
  tiff-reconf:
        cd libs/tiff-4.0.2 && autoreconf -fi
@@ -36,7 +36,7 @@
        cd libs/tiff-4.0.2 && make
  
  python-reconf:
-@@ -674,9 +679,6 @@ iks-reconf:
+@@ -673,9 +678,6 @@ iks-reconf:
        $(MAKE) mod_dingaling-clean
  
  spandsp-reconf: tiff-reconf