summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-24 00:03:25 +0100
committerAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-24 00:03:25 +0100
commitb587c99151714f07dcb63db2b36b13affa9295de (patch)
tree300f9f4122bb7691d6b838b26d2b8c3509b5284d
parentae081c50aa1a01506e0298d74643bba6586efc2b (diff)
downloadembtoolkit-b587c99151714f07dcb63db2b36b13affa9295de.tar.gz
embtoolkit-b587c99151714f07dcb63db2b36b13affa9295de.tar.bz2
embtoolkit-b587c99151714f07dcb63db2b36b13affa9295de.tar.xz
Packages: freetype: adapt libtool files for cross compile
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
-rw-r--r--packages/graphics/freetype/freetype.mk15
1 files changed, 1 insertions, 14 deletions
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index 82cec69..098c912 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -41,7 +41,7 @@ $(FREETYPE_BUILD_DIR)/.installed: zlib_target_install download_freetype \
freetype-$(FREETYPE_VERSION) in your root filesystem...")
$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) $(J)
$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) DESTDIR=$(SYSROOT) install
- $(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.libtoolpatched
+ $(Q)$(MAKE) libtool_files_adapt
$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.pkgconfigpatched
$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.freetype-configpatched
@touch $@
@@ -73,19 +73,6 @@ $(FREETYPE_BUILD_DIR)/.freetype-configpatched:
> freetype-config.new;\
cp freetype-config.new freetype-config; rm freetype-config.new
-$(FREETYPE_BUILD_DIR)/.libtoolpatched:
-ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
- $(Q)cd $(SYSROOT)/usr/lib32; \
- cat libfreetype.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib32;' \
- > libfreetype.la.new;\
- cp libfreetype.la.new libfreetype.la; rm libfreetype.la.new
-else
- $(Q)cd $(SYSROOT)/usr/lib; \
- cat libfreetype.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib;' \
- > libfreetype.la.new;\
- cp libfreetype.la.new libfreetype.la; rm libfreetype.la.new
-endif
-
$(FREETYPE_BUILD_DIR)/.pkgconfigpatched:
ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
$(Q)cd $(SYSROOT)/usr/lib32/pkgconfig;\