From 26fd0cbac936573dfb984bc721cddd46417d64f3 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 26 Feb 2021 11:58:40 -0300 Subject: [PATCH 1/2] imagemagick: copy *-config files to staging dir We need to copy MagickWand-config, which handles pkg-config data, to the staging dir, so that dependent packages can use it. php7-pecl-imagick, for example, may otherwise use an eventual host-installed file, causing compilation to fail. There's also a MagickCore-config file that does the same thing for the MagickCore library, so a *-config wilcard is used to handle all cases. Since configure is called with --prefix=/usr, use $(SED) to change definition of prefix and exec_prefix lines in *-config from /usr to $(STAGING_DIR)/usr. Signed-off-by: Eneas U de Queiroz --- multimedia/imagemagick/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/multimedia/imagemagick/Makefile b/multimedia/imagemagick/Makefile index 482425131..6397be753 100644 --- a/multimedia/imagemagick/Makefile +++ b/multimedia/imagemagick/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=imagemagick PKG_VERSION:=7.0.9 PKG_REVISION:=5 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Val Kulkov PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION).tar.gz @@ -126,6 +126,13 @@ define Build/InstallDev $(INSTALL_DATA) \ $(PKG_INSTALL_DIR)/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 IMlibdir:=usr/lib/ImageMagick-$(PKG_VERSION) From f434a33a13454d09fcc287477193b4626c387deb Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Fri, 26 Feb 2021 13:21:17 -0300 Subject: [PATCH 2/2] php7-pecl-imagick: configure --with-imagick=... Add --with-imagick=$(STAGING_DIR)/usr so that configure picks MagickWand-config from there, before it finds an eventual host-installed version. Signed-off-by: Eneas U de Queiroz --- lang/php7-pecl-imagick/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/php7-pecl-imagick/Makefile b/lang/php7-pecl-imagick/Makefile index 4582e9373..3036db997 100644 --- a/lang/php7-pecl-imagick/Makefile +++ b/lang/php7-pecl-imagick/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=imagick PECL_LONGNAME:=Image Processing (ImageMagick binding) PKG_VERSION:=3.4.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077 PKG_NAME:=php7-pecl-imagick @@ -29,5 +29,7 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include ../php7/pecl.mk +CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr" + $(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30)) $(eval $(call BuildPackage,$(PKG_NAME)))