diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:18:54 +0200 |
| commit | ac46bdeef28bc2b65e1880884a79257c28e423a7 (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/ImageMagick | |
| parent | 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04 (diff) | |
| parent | 84b90159b05aaa4e914ce51d2b1319218c32d8a1 (diff) | |
fix conflict, autoseect libgcj
Diffstat (limited to 'package/ImageMagick')
| -rw-r--r-- | package/ImageMagick/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index fce893764..3ff05701d 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -36,6 +36,7 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT})) $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-gslib \ --without-dps \ |