Merge pull request #14914 from cotequeiroz/php7-pecl-imagick
php7-pecl-imagick, imagemagick: save & use MagickWand-config
This commit is contained in:
commit
8fbff0ec68
2 changed files with 11 additions and 2 deletions
|
@ -9,7 +9,7 @@ PECL_NAME:=imagick
|
||||||
PECL_LONGNAME:=Image Processing (ImageMagick binding)
|
PECL_LONGNAME:=Image Processing (ImageMagick binding)
|
||||||
|
|
||||||
PKG_VERSION:=3.4.4
|
PKG_VERSION:=3.4.4
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
PKG_HASH:=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
|
PKG_HASH:=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077
|
||||||
|
|
||||||
PKG_NAME:=php7-pecl-imagick
|
PKG_NAME:=php7-pecl-imagick
|
||||||
|
@ -29,5 +29,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||||
include $(INCLUDE_DIR)/nls.mk
|
include $(INCLUDE_DIR)/nls.mk
|
||||||
include ../php7/pecl.mk
|
include ../php7/pecl.mk
|
||||||
|
|
||||||
|
CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr"
|
||||||
|
|
||||||
$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
|
$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
|
||||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||||
|
|
|
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=imagemagick
|
PKG_NAME:=imagemagick
|
||||||
PKG_VERSION:=7.0.9
|
PKG_VERSION:=7.0.9
|
||||||
PKG_REVISION:=5
|
PKG_REVISION:=5
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
|
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION).tar.gz
|
||||||
|
@ -126,6 +126,13 @@ define Build/InstallDev
|
||||||
$(INSTALL_DATA) \
|
$(INSTALL_DATA) \
|
||||||
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
|
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
|
||||||
$(1)/usr/lib/pkgconfig/
|
$(1)/usr/lib/pkgconfig/
|
||||||
|
|
||||||
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
|
$(INSTALL_BIN) \
|
||||||
|
$(PKG_INSTALL_DIR)/usr/bin/*-config \
|
||||||
|
$(1)/usr/bin/
|
||||||
|
$(SED) 's|prefix=/usr|prefix=$(STAGING_DIR)/usr|' \
|
||||||
|
$(1)/usr/bin/*-config
|
||||||
endef
|
endef
|
||||||
|
|
||||||
IMlibdir:=usr/lib/ImageMagick-$(PKG_VERSION)
|
IMlibdir:=usr/lib/ImageMagick-$(PKG_VERSION)
|
||||||
|
|
Loading…
Reference in a new issue