mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/imagemagick: fix configure error with --disable-opencl in setups without libltdl

Browse Source 
Fixes:
http://autobuild.buildroot.net/results/d9a/d9a84b642357f758c3f84270fb9a109abd7e2684/

configure.ac contains a test using $ax_cv_check_cl_libcl:

if test "$build_modules" != 'no' || test "X$ax_cv_check_cl_libcl" != Xno; then
  AC_MSG_RESULT([-------------------------------------------------------------])
  AC_MSG_CHECKING([for libltdl])

But ax_cv_check_cl_libcl is only assigned a value (yes/no) if
--disable-opencl is NOT passed, as the assignment logic is inside a
conditional:

AC_ARG_ENABLE([opencl],
    [AC_HELP_STRING([--disable-opencl],
                    [do not use OpenCL])],
    [disable_opencl=$enableval],
    [disable_opencl='yes'])

if test "$disable_opencl" = 'yes'; then
  ..
  AC_CACHE_CHECK([for OpenCL library], [ax_cv_check_cl_libcl],

So configure errors out if --disable-opencl is passed on setups where
libltdl isn't available:

checking if libltdl package is complete... no
configure: error: in `/home/naourr/work/instance-0/output-1/build/imagemagick-7.0.8-59':
configure: error: libltdl is required for modules and OpenCL builds

As a workaround, explictly set ax_cv_check_cl_libcl=no to skip this
conditional.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit cf9591660a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2020-02-04 22:29:09 +01:00
parent 91688f1444
commit d59e6f1a9a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/imagemagick/imagemagick.mk
View File

@@ -18,7 +18,9 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy)
IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
endif endif
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64 IMAGEMAGICK_CONF_ENV = \
ac_cv_sys_file_offset_bits=64 \
ax_cv_check_cl_libcl=no
IMAGEMAGICK_CONF_OPTS = \ IMAGEMAGICK_CONF_OPTS = \
--program-transform-name='s,,,' \ --program-transform-name='s,,,' \
@@ -184,7 +186,9 @@ HOST_IMAGEMAGICK_CONF_OPTS = \
--with-zlib --with-zlib
# uses clock_gettime, which was provided by librt in glibc < 2.17 # uses clock_gettime, which was provided by librt in glibc < 2.17
HOST_IMAGEMAGICK_CONF_ENV = LIBS="-lrt" HOST_IMAGEMAGICK_CONF_ENV = \
LIBS="-lrt" \
ax_cv_check_cl_libcl=no
HOST_IMAGEMAGICK_DEPENDENCIES = \ HOST_IMAGEMAGICK_DEPENDENCIES = \
host-libjpeg \ host-libjpeg \