diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-02-23 21:27:28 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-02-23 21:27:28 +0100 |
| commit | 4f05a61b33e5d87f23837109fb0dd538a5bd5d62 (patch) | |
| tree | f1b375060271ec5fd5da6fe89955b11b7c238fae /package/imagemagick | |
| parent | 52fcd86f2ba1249e74ed04ef39cb3cbea16024c7 (diff) | |
| parent | f08e9eea1b70f057cc0a3efa18b2acb4faea4abe (diff) | |
| download | buildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.tar.gz buildroot-novena-4f05a61b33e5d87f23837109fb0dd538a5bd5d62.zip | |
Merge branch 'misc-fixes5' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/imagemagick')
| -rw-r--r-- | package/imagemagick/imagemagick.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 2bcd076cd..00895f593 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 $@ @@ -76,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) |