summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-24 00:13:39 +0100
committerAbdoulaye Walsimou Gaye <walsimou@walsimou.com>2009-12-24 00:13:39 +0100
commitf5ec2fe28308d038a799f2ed32a648f7759215ef (patch)
tree2a64e81ef186b3999b3dd5dac720639d4df1783c
parentb587c99151714f07dcb63db2b36b13affa9295de (diff)
downloadembtoolkit-f5ec2fe28308d038a799f2ed32a648f7759215ef.tar.gz
embtoolkit-f5ec2fe28308d038a799f2ed32a648f7759215ef.tar.bz2
embtoolkit-f5ec2fe28308d038a799f2ed32a648f7759215ef.tar.xz
Packages: libjpeg: adapt libtool files for cross compile
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
-rw-r--r--packages/graphics/libjpeg/libjpeg.mk16
1 files changed, 1 insertions, 15 deletions
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index 7852235..d62bf14 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -40,8 +40,7 @@ $(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
jpeg-$(LIBJPEG_VERSION) in your root filesystem...")
$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J)
$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(SYSROOT) install
- $(Q)$(MAKE) $(LIBJPEG_BUILD_DIR)/.libtoolpatched
-
+ $(Q)$(MAKE) libtool_files_adapt
@touch $@
download_libjpeg:
@@ -64,19 +63,6 @@ $(LIBJPEG_BUILD_DIR)/.configured:
--prefix=/usr --enable-static=no --program-suffix=""
@touch $@
-$(LIBJPEG_BUILD_DIR)/.libtoolpatched:
-ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
- $(Q)cd $(SYSROOT)/usr/lib32; \
- cat libjpeg.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib32;' \
- > libjpeg.la.new;\
- cp libjpeg.la.new libjpeg.la; rm libjpeg.la.new
-else
- $(Q)cd $(SYSROOT)/usr/lib; \
- cat libjpeg.la | sed -e 's;\/usr\/lib;$(SYSROOT)\/usr\/lib;' \
- > libjpeg.la.new;\
- cp libjpeg.la.new libjpeg.la; rm libjpeg.la.new
-endif
-
libjpeg_clean:
$(call EMBTK_GENERIC_MESSAGE,"cleanup jpeg-$(LIBJPEG_VERSION)...")
$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(LIBJPEG_BINS)