package/imagemagick: fix configure error with --disable-opencl in setups without libltdl
PATCH 1/1 package/imagemagick: fix configure error with --disable-opencl in setups without libltdl
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.
--- package/imagemagick/imagemagick.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
package/imagemagick/imagemagick.mk +6 -2
@@ -18,7 +18,9 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config 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 = \ --program-transform-name='s,,,' \
@@ -179,7 +181,9 @@ HOST_IMAGEMAGICK_CONF_OPTS = \ --with-zlib # 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-libjpeg \
Signature · 1 line
2.20.1
Yann E. MORIN
AppliedPATCH 1/1 package/imagemagick: fix configure error with --disable-opencl in setups without libltdl
Peter, All,
On 2020-02-04 22:29 +0100, Peter Korsgaard spake thusly:
Quoted 26 lines
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_libclis 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:
Quoted 8 lines
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 buildsAs a workaround, explictly set ax_cv_check_cl_libcl=no to skip this conditional.
Signed-off-by Peter Korsgaard <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 37 lines
--- package/imagemagick/imagemagick.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)package/imagemagick/imagemagick.mk +6
-2@@ -18,7 +18,9 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config 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 = \ --program-transform-name='s,,,' \@@ -179,7 +181,9 @@ HOST_IMAGEMAGICK_CONF_OPTS = \ --with-zlib # 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-libjpeg \Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/imagemagick: fix configure error with --disable-opencl in setups without libltdl
In reply to Peter KorsgaardQuoted 28 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
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_libclis 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:
Quoted 8 lines
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 buildsAs a workaround, explictly set ax_cv_check_cl_libcl=no to skip this conditional.
Signed-off-by Peter Korsgaard <[email protected]>
Committed to 2019.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard