Changeset 35829


Ignore:
Timestamp:
2013-02-28T04:00:42+01:00 (5 years ago)
Author:
mazilo
Message:

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

Location:
packages/net/freeswitch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/freeswitch/Makefile

    r35756 r35829  
    1919PKG_SOURCE_PROTO:=git 
    2020PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git 
    21 FS_DEFAULT_HEAD:=3e31837a0bb417a328d9877647bbb1bb2ed51b5f 
     21FS_DEFAULT_HEAD:=8258e782d47f4b01c4684b68ecce417298fbbebe 
    2222FS_LATEST_HEAD:=$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1) 
    2323PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD)) 
     
    681681        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/ 
    682682        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/ 
    683         $(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) 
     683        $(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) 
    684684endef 
    685685 
     
    842842        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(patsubst lib%,%,$(3)).pc $$(1)/usr/lib/pkgconfig 
    843843        $(CP) $(PKG_INSTALL_DIR)/usr/lib/$(1)* $$(1)/usr/lib/ 
    844         $(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) 
     844        $(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) 
    845845  endef 
    846846 
     
    874874 
    875875        # 
     876        # mod_$(subst -,_,$(1)): $(5) 
     877        # 
     878        $(foreach f,$(5),[ -d $(dir $$(1)/usr/${f}) ] || $(INSTALL_DIR) $(dir $$(1)/usr/${f});$(CP) $(PKG_INSTALL_DIR)/usr/${f} $$(1)/usr;) 
     879 
     880        # 
    876881        # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH. 
    877882        # 
    878         for f in $$(1)/usr/lib/$(PKG_NAME)/mod_$(subst -,_,$(1)).la $$$$(wildcard $$(1)/usr/lib/$(PKG_NAME)/$(4)_*.la); \ 
     883        for f in `ls $$(1)/usr/lib/$(PKG_NAME)/*.la`; \ 
    879884        do \ 
    880                 $$(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}); \ 
    881         done 
    882  
    883         for f in $(5); \ 
    884         do \ 
    885                 [ -d "$(dir $$(1)/usr/$(f))" ] || $(INSTALL_DIR) $(dir $$(1)/usr/$(f)); \ 
    886                 $(CP) $(PKG_INSTALL_DIR)/usr/$(f) $$(1)/usr/$(f); \ 
     885                $(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}; \ 
    887886        done 
    888887 
     
    920919  define Package/$(PKG_NAME)-mod-$(1)/postinst 
    921920#!/bin/sh 
    922 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 
     921$(SED) 's|^\([ \t]*\)<!-- *\(.*\)"mod_$(subst -,_,$(1))"\(.*\) *-->\(.*\)$$$$|\1\2"mod_$(subst -,_,$(1))"\3\4|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
    923922  endef 
    924923 
    925924  define Package/$(PKG_NAME)-mod-$(1)/postrm 
    926925#!/bin/sh 
    927 sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
     926$(SED) 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1<!-- \2"mod_$(subst -,_,$(1))"\3 -->|' $$$$(IPKG_INSTROOT)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml 
    928927  endef 
    929928 
  • packages/net/freeswitch/patches/003-Makefile.am.patch

    r35575 r35829  
    99 SUBDIRS = . src 
    1010 AUTOMAKE_OPTIONS = foreign 
    11 @@ -165,7 +169,6 @@ ZRTP_LIBS = -lbn -lzrtp 
     11@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp 
    1212 libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS) 
    1313 libfreeswitch_la_LIBADD += $(ZRTP_LIBS) 
     
    1717  
    1818 library_includedir      = $(includedir) 
    19 @@ -423,7 +426,7 @@ $(switch_builddir)/quiet_libtool: $(swit 
     19@@ -422,7 +425,7 @@ $(switch_builddir)/quiet_libtool: $(swit 
    2020        @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool 
    2121  
     
    2626 src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS) 
    2727        @cat $< > $@; \ 
    28 @@ -649,7 +652,9 @@ sndfile-reconf: 
     28@@ -648,7 +651,9 @@ sndfile-reconf: 
    2929  
    3030 tiff-reconf: 
     
    3737  
    3838 python-reconf: 
    39 @@ -674,9 +679,6 @@ iks-reconf: 
     39@@ -673,9 +678,6 @@ iks-reconf: 
    4040        $(MAKE) mod_dingaling-clean 
    4141  
Note: See TracChangeset for help on using the changeset viewer.