From cf04b9e0c5f7b55817999a5dd01d7ce740fd3d8e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 21 Feb 2010 13:35:19 +0100 Subject: imagemagick: help configure to detect file_offset_bits imagemagick configure script wants to run programs to detect the file_offset_bits, but fails since it is running cross-compile mode. Therefore, we help the configure script by passing the appropriate ac_cv variable. Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'package/imagemagick') diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 2bcd076cd..e8584306e 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -31,6 +31,12 @@ $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE) $(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config touch $@ +ifeq ($(BR2_LARGEFILE),y) +IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=64 +else +IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=32 +endif + $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked (cd $(IMAGEMAGICK_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ @@ -55,6 +61,7 @@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked --without-fpx \ --without-freetype \ --without-x \ + $(IMAGEMAGICK_CONF_OPTS) \ ) touch $@ -- cgit v1.2.3 From b7ea597dd2f3553f2bc44e441011e68f999c7768 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 21 Feb 2010 13:39:35 +0100 Subject: imagemagick: use internal libtool For some reason, our imagemagick.mk file calls libtool, but assumes that libtool is available on the host, which may not be true. Therefore, we use ImageMagick's internal libtool, which has been used for compiling/linking all the rest of ImageMagic anyway. Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/imagemagick') diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index e8584306e..00895f593 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -83,8 +83,8 @@ $(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagickCore.a touch -c $@ $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB) - libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders - libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters + $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders + $(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters touch $@ $(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB) -- cgit v1.2.3