diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-03 00:06:24 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-07-03 00:06:24 +0200 |
| commit | c8ca6a6482aef69e39139d94fd205580290cc8ac (patch) | |
| tree | 4fb63a6b0694c6a604da37bb7e2843afb3b61b21 | |
| parent | 1b9689177783513c1f54ee8bca1a878058cf4954 (diff) | |
| download | embtoolkit-c8ca6a6482aef69e39139d94fd205580290cc8ac.tar.gz embtoolkit-c8ca6a6482aef69e39139d94fd205580290cc8ac.tar.bz2 embtoolkit-c8ca6a6482aef69e39139d94fd205580290cc8ac.tar.xz | |
Embtk generic macros: remove unused libtool_files_restore and improve __embtk_fix_libtool_files
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/macros.mk | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index ff61b34..e134ee1 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -142,37 +142,17 @@ endif $(call embtk_echo_blue,"################################################################################") #Macro to adapt libtool files (*.la) for cross compiling +__ltlibdirold=libdir='\/usr\/$(LIBDIR)' +__ltlibdirnew=libdir='$(SYSROOT)\/usr\/$(LIBDIR)' define __embtk_fix_libtool_files - @LIBTOOLS_LA_FILES=`find $(SYSROOT)/usr/$(LIBDIR) -name *.la`; \ - for i in $$LIBTOOLS_LA_FILES; do \ - sed -e "s;libdir='\/usr\/$(LIBDIR)';libdir='$(SYSROOT)\/usr\/$(LIBDIR)';" $$i \ - > $$i.new; \ - mv $$i.new $$i; \ + @LIBTOOLS_LA_FILES=`find $(SYSROOT)/usr/$(LIBDIR) -name *.la`; \ + for i in $$LIBTOOLS_LA_FILES; do \ + sed -i "s;$(__ltlibdirold);$(__ltlibdirnew);" $$i; \ done endef libtool_files_adapt: $(Q)$(call __embtk_fix_libtool_files) -#Macro to restore libtool files (*.la) -libtool_files_restore: -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - @LIBTOOLS_LA_FILES=`find $(SYSROOT)/usr/lib32 -name *.la`; \ - for i in $$LIBTOOLS_LA_FILES; \ - do \ - sed -e "s;libdir='$(SYSROOT)\/usr\/lib32';libdir='\/usr\/lib32';" $$i \ - > $$i.new; \ - mv $$i.new $$i; \ - done -else - @LIBTOOLS_LA_FILES=`find $(SYSROOT)/usr/lib -name *.la`; \ - for i in $$LIBTOOLS_LA_FILES; \ - do \ - sed -e "s;libdir='$(SYSROOT)\/usr\/lib';libdir='\/usr\/lib';" < $$i \ - > $$i.new; \ - mv $$i.new $$i; \ - done -endif - #Macro to adapt pkg-config files for cross compiling define __embtk_fix_pkgconfig_files @PKGCONFIG_FILES=`find $(SYSROOT)/usr/$(LIBDIR)/pkgconfig -name *.pc`; \ |