package/imagemagick: explicitly disable opencl
authorJulien Olivain <juju@cotds.org>
Fri, 23 Aug 2019 19:14:17 +0000 (21:14 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 3 Feb 2020 16:03:24 +0000 (17:03 +0100)
Some packages installs libOpenCL without declaring
BR2_PACKAGE_PROVIDES_LIBOPENCL (e.g.  imx-gpu-viv).  ImageMagick will detect
the library and will require libtool.  Since libtool is not in dependencies,
build might fail.

To prevent that situation, explicitly disable opencl support for target and host.

Signed-off-by: Julien Olivain <juju@cotds.org>
[Peter: drop unneeded ax_cv_check_cl_libcl=no]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/imagemagick/imagemagick.mk

index 0bac0b4fc3e0c1604c91199c9eefed8594ccadf8..eaa291a1bd91f0388922f32522b2be19adabac63 100644 (file)
@@ -22,6 +22,7 @@ IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
 
 IMAGEMAGICK_CONF_OPTS = \
        --program-transform-name='s,,,' \
+       --disable-opencl \
        --disable-openmp \
        --without-djvu \
        --without-dps \
@@ -152,6 +153,7 @@ IMAGEMAGICK_CONF_OPTS += --without-bzlib
 endif
 
 HOST_IMAGEMAGICK_CONF_OPTS = \
+       --disable-opencl \
        --disable-openmp \
        --without-djvu \
        --without-dps \