From 0a60c205492cd95e08a70ae552bf087d9ccad47e Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Thu, 24 Dec 2009 01:16:17 +0100 Subject: Packages: libpng: adapt libtool files for cross compile Signed-off-by: Abdoulaye Walsimou Gaye --- packages/graphics/libpng/libpng.mk | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'packages/graphics/libpng') diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk index ec9b61f..c8b0f28 100644 --- a/packages/graphics/libpng/libpng.mk +++ b/packages/graphics/libpng/libpng.mk @@ -41,7 +41,7 @@ $(LIBPNG_BUILD_DIR)/.installed: zlib_target_install download_libpng \ libpng-$(LIBPNG_VERSION) in your root filesystem...") $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install - $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libtoolpatched + $(Q)$(MAKE) libtool_files_adapt $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.pkgconfigpatched $(Q)$(MAKE) $(LIBPNG_BUILD_DIR)/.libpng-configpatched @touch $@ @@ -73,19 +73,6 @@ $(LIBPNG_BUILD_DIR)/.libpng-configpatched: > libpng-config.new;\ cp libpng-config.new libpng-config; rm libpng-config.new -$(LIBPNG_BUILD_DIR)/.libtoolpatched: -ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) - $(Q)cd $(SYSROOT)/usr/lib32; \ - cat libpng.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib32;' \ - > libpng.la.new;\ - cp libpng.la.new libpng.la; rm libpng.la.new -else - $(Q)cd $(SYSROOT)/usr/lib; \ - cat libpng.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib;' \ - > libpng.la.new;\ - cp libpng.la.new libpng.la; rm libpng.la.new -endif - $(LIBPNG_BUILD_DIR)/.pkgconfigpatched: ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y) $(Q)cd $(SYSROOT)/usr/lib32/pkgconfig; \ -- cgit v1.2.3