From eecfe810a6ab5b70dd387b46907f70c6a77ad56d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 11 Nov 2022 23:40:10 +0100 Subject: [PATCH] package/imagemagick: utilities now need C++ support Since upstream commit https://github.com/ImageMagick/ImageMagick/commit/07f3b487f9860fd4eb9422f1a906d0fe83b6fd1c (which first appeared in version 7.1.0-47), ImageMagick forces the need of a C++ compiler to build its utilities. Despite the request of Bernd Kuhls to revert this change, upstream declined. Since this change is causing build failures in our autobuilders, our only choice is to follow the choice of upstream, and disable building the utilities when C++ support is not available. Fixes: http://autobuild.buildroot.net/results/4283235d697408cf2e70be5e3769dbe6ebb9ddae/ Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 0910ada70b7194596c6ace0cb06b303173c13de7) Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 6bdf24c1e8..8a2ec460d5 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -178,6 +178,12 @@ else IMAGEMAGICK_CONF_OPTS += --without-bzlib endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +IMAGEMAGICK_CONF_OPTS += --with-utilities +else +IMAGEMAGICK_CONF_OPTS += --without-utilities +endif + HOST_IMAGEMAGICK_CONF_OPTS = \ --disable-opencl \ --disable-openmp \