summaryrefslogtreecommitdiff
path: root/package/ImageMagick
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-24 15:30:43 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-24 15:30:51 +0200
commit53a04c2cc20d7fc34a6d772571b41e37c432e22b (patch)
tree34daba79a0ccf571bd19ee8420a274d55b167ece /package/ImageMagick
parent0e5494c148d3385fb7d5e463b0aaa5448dcd825d (diff)
remove PKG_NEED_CXX
Diffstat (limited to 'package/ImageMagick')
-rw-r--r--package/ImageMagick/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index dc42ebe55..4979c76af 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -10,11 +10,11 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0
PKG_DESCR:= image processing and converting utility
PKG_SECTION:= multimedia
-PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny libtool e2fsprogs
-PKG_BUILDDEP+= pango
+PKG_DEPENDS:= libstdcxx
+PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig libiconv-tiny
+PKG_BUILDDEP+= pango libtool e2fsprogs
PKG_URL:= http://www.imagemagick.org/
PKG_SITES:= http://image_magick.veidrodis.com/image_magick/
-PKG_NEED_CXX:= 1
PKG_LIBNAME:= libimagemagic
PKG_OPTS:= dev
@@ -23,7 +23,7 @@ PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK
PKGSD_LIBIMAGEMAGICK:= imagemagick library
PKGSC_LIBIMAGEMAGICK:= libs
-PKGSS_LIBIMAGEMAGICK:= libjpeg libtiff
+PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng
PKGSD_CONVERT:= image processing and converting utility
PKGSC_CONVERT:= multimedia
PKGSS_CONVERT:= libimagemagick
@@ -41,7 +41,6 @@ $(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_ENV+= ac_cv_sys_file_offset_bits=yes
CONFIGURE_ARGS+= --with-magick-plus-plus=no \
--without-gslib \