From f31498587a4b0b6d7f8efab2b63d8f8041bab091 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 23 Aug 2019 21:14:17 +0200 Subject: [PATCH] package/imagemagick: explicitly disable opencl 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 [Peter: drop unneeded ax_cv_check_cl_libcl=no] Signed-off-by: Peter Korsgaard (cherry picked from commit 9056908e93daae5af08a123e0bc05072c6e6c58e) Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index a0c91f9183..d85682b416 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -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 \