mirror of
https://github.com/danog/docker-php-extension-installer.git
synced 2024-12-11 17:09:51 +01:00
Merge pull request #356 from mlocati/imagick-php8
Remove no more needed patches for imagick with PHP 8+
This commit is contained in:
commit
fbd19903cf
@ -1682,26 +1682,6 @@ installRemoteModule() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
imagick)
|
|
||||||
if test $PHP_MAJMIN_VERSION -ge 800; then
|
|
||||||
if test -z "$installRemoteModule_version"; then
|
|
||||||
installRemoteModule_version=132a11fd26675db9eb9f0e9a3e2887c161875206
|
|
||||||
fi
|
|
||||||
if test "${installRemoteModule_version%.*}" = "$installRemoteModule_version"; then
|
|
||||||
installRemoteModule_displayVersion="$installRemoteModule_version"
|
|
||||||
else
|
|
||||||
installRemoteModule_displayVersion="git--master-$installRemoteModule_version"
|
|
||||||
fi
|
|
||||||
installRemoteModule_src="$(getPackageSource https://codeload.github.com/Imagick/imagick/tar.gz/$installRemoteModule_version)"
|
|
||||||
cd -- "$installRemoteModule_src"
|
|
||||||
sed -Ei "s/^([ \t]*#define[ \t]+PHP_IMAGICK_VERSION[ \t]+\")@PACKAGE_VERSION@(\")/\1git--master-$installRemoteModule_displayVersion\2/" php_imagick.h
|
|
||||||
phpize
|
|
||||||
./configure
|
|
||||||
make -j$(getProcessorCount)
|
|
||||||
make install
|
|
||||||
installRemoteModule_manuallyInstalled=1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
inotify)
|
inotify)
|
||||||
if test -z "$installRemoteModule_version"; then
|
if test -z "$installRemoteModule_version"; then
|
||||||
if test $PHP_MAJMIN_VERSION -le 506; then
|
if test $PHP_MAJMIN_VERSION -le 506; then
|
||||||
@ -2284,9 +2264,6 @@ configureInstaller() {
|
|||||||
if test "$PHP_MODULE_TO_INSTALL" = 'amqp' && test $PHP_MAJMIN_VERSION -ge 800; then
|
if test "$PHP_MODULE_TO_INSTALL" = 'amqp' && test $PHP_MAJMIN_VERSION -ge 800; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if test "$PHP_MODULE_TO_INSTALL" = 'imagick' && test $PHP_MAJMIN_VERSION -ge 800; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
if ! stringInList "$PHP_MODULE_TO_INSTALL" "$BUNDLED_MODULES"; then
|
if ! stringInList "$PHP_MODULE_TO_INSTALL" "$BUNDLED_MODULES"; then
|
||||||
if test $PHP_MAJMIN_VERSION -lt 800; then
|
if test $PHP_MAJMIN_VERSION -lt 800; then
|
||||||
pecl channel-update pecl.php.net || true
|
pecl channel-update pecl.php.net || true
|
||||||
|
Loading…
Reference in New Issue
Block a user