summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-08-12 12:06:58 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-08-13 08:16:11 (GMT)
commitb339bb5641c59ad2e19aeb95c1387584c7c2aeab (patch)
treeccbac47d2e28d8488f28facf53c1d822e4497d1e
parentb40ad28a54e17333fa380cf133e7f0ffc9834a46 (diff)
downloadbuildroot-b339bb5641c59ad2e19aeb95c1387584c7c2aeab.tar.gz
buildroot-b339bb5641c59ad2e19aeb95c1387584c7c2aeab.tar.bz2
imagemagick: fix magick++-config fixup error
Magic++ bindings are built only with C++ and WCHAR toolchains. Add a WCHAR toolchain check for the magick++ config fixup. Looking into the future the fixup shouldn't bail on a missing file so we can avoid awkward kludges for packages that have many options and config files. Fixes: http://autobuild.buildroot.net/results/33a/33ac4b17866a64379b7bab3c0549f6e075c98dde/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/imagemagick/imagemagick.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 12b9f4b..2149574 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -19,7 +19,7 @@ IMAGEMAGICK_AUTORECONF = YES
IMAGEMAGICK_CONFIG_SCRIPTS = \
$(addsuffix -config,Magick MagickCore MagickWand Wand)
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy)
IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
endif