From patchwork Mon Aug 12 12:06:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 266507 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id BEF3D2C00D3 for ; Mon, 12 Aug 2013 22:07:17 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D92553196B; Mon, 12 Aug 2013 12:07:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R8QZcFlv7KyR; Mon, 12 Aug 2013 12:07:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8A3DA26EFD; Mon, 12 Aug 2013 12:07:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6D90A1BF833 for ; Mon, 12 Aug 2013 12:07:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 713A98C860 for ; Mon, 12 Aug 2013 12:07:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xttfmwqB1A-E for ; Mon, 12 Aug 2013 12:07:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id E73E9895FD for ; Mon, 12 Aug 2013 12:07:08 +0000 (UTC) Received: from asgard (host181.190-138-224.telecom.net.ar [190.138.224.181]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r7CC716p016679 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 12 Aug 2013 12:07:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1376309226; bh=OR6HxWVMF0lx6tOfSVox/6hGWtWodpOD2pnKdvePGio=; h=From:To:Cc:Subject:Date; b=D5rn669tD5zEsO1nz8bJiKzK1Lus8zOKyuVX6XsCFvhoCLB5Ged6O4k0LjrYU7i+M s6PNxp1FCTfxGPnq/D6sTHDU5NIGEJ9Zzdd6iDxLHdRsEGSBWZWdugECDPsFFSZp73 oVnLdt+VqBJIUr26W5/ZZlzroTGBboHiczEVEoKQ= Received: by asgard (sSMTP sendmail emulation); Mon, 12 Aug 2013 09:06:59 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 12 Aug 2013 09:06:58 -0300 Message-Id: <1376309218-6060-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] imagemagick: fix magick++-config fixup error X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- package/imagemagick/imagemagick.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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