From a30f2ca0fc3de307d5c9a83fd36bcedcb026ecd2 Mon Sep 17 00:00:00 2001 From: Remi Pommarel Date: Thu, 9 Sep 2021 16:47:40 +0200 Subject: [PATCH] php-imagick: Cross compilation support --- ...pile-libmagick-header-file-search-path.patch | 17 +++++++++++++++++ srcpkgs/php-imagick/template | 7 ++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch diff --git a/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch new file mode 100644 index 00000000000..16b8aaa5737 --- /dev/null +++ b/srcpkgs/php-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch @@ -0,0 +1,17 @@ +--- a/imagemagick.m4 2021-09-09 10:53:42.287881616 +0200 ++++ b/imagemagick.m4 2021-09-09 11:14:47.662312430 +0200 +@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[ + + AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h]) + ++ elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then ++ ++ IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" ++ IM_HEADER_STYLE="SEVEN" ++ AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header]) ++ ++ AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h]) ++ + elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then + + IM_INCLUDE_FORMAT="MagickWand/MagickWand.h" diff --git a/srcpkgs/php-imagick/template b/srcpkgs/php-imagick/template index dba22bb860c..271bbe6959a 100644 --- a/srcpkgs/php-imagick/template +++ b/srcpkgs/php-imagick/template @@ -1,9 +1,10 @@ # Template file for 'php-imagick' pkgname=php-imagick version=3.4.4 -revision=3 +revision=4 wrksrc="imagick-$version" build_style=gnu-configure +configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr" hostmakedepends="php-devel autoconf pkg-config" makedepends="php-devel pcre2-devel libmagick-devel" depends="php>=7.4.3" @@ -14,10 +15,6 @@ homepage="https://pecl.php.net/package/imagick" distfiles="https://pecl.php.net/get/imagick-$version.tgz" checksum=8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077 -if [ -n "$CROSS_BUILD" ]; then - broken="checking for MagickWand.h or magick-wand.h header... configure: error: Unable to find MagickWand.h or magick-wand.h header" -fi - pre_configure() { phpize }