From patchwork Thu Nov 22 00:17:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 200896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id BCD262C008C for ; Thu, 22 Nov 2012 11:20:32 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 893318CEDA; Thu, 22 Nov 2012 00:20:29 +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 GAU4BCXCF7Mk; Thu, 22 Nov 2012 00:20:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5CCB58160D; Thu, 22 Nov 2012 00:19:43 +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 E6B4A8F74A for ; Thu, 22 Nov 2012 00:19:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 01BA7805C5 for ; Thu, 22 Nov 2012 00:19:03 +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 6cURPGUusSwq for ; Thu, 22 Nov 2012 00:18:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C1A18C7E6 for ; Thu, 22 Nov 2012 00:18:47 +0000 (UTC) Received: by mail-wg0-f53.google.com with SMTP id e12so1163520wge.10 for ; Wed, 21 Nov 2012 16:18:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=s1DRi7L6mIIS9PRUDQ5UWqImVL30MsXjNDzGfj5IqpI=; b=Bafa/6Ds4+h+VMKcYYwSSm/sCCPG1oJRtvye5wIqcqHBGQ+U4i91mSoy1KMedJkEgK oLHq4j0KTSABu+sU9r927LA5OMBd4TB7KmJZ01CMIQZibgiuphfgoiJ+SoaQcf87lYha +4ugr2825XzE5ZoeadOutMK+Wm8cHLTjqO55rEOeRxNK+DqcmIuY7ImgIv4TIzcan9OL +cT6dEdirr7FiJuwf38QOiV/Uk0bZdrXGTX2hA39yY+8LiHFm4oilJF0FRRmUI1fyBKp NlkEkQohTXfr8U4f/wACq2OJu33+boavR9tWjcT5LJdZmiOt4Y3k9UxB7rKGkKOMIx6m eOAA== Received: by 10.216.90.129 with SMTP id e1mr8403871wef.87.1353543526248; Wed, 21 Nov 2012 16:18:46 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id r10sm1847697wiz.0.2012.11.21.16.18.44 (version=SSLv3 cipher=OTHER); Wed, 21 Nov 2012 16:18:45 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Thu, 22 Nov 2012 01:17:55 +0100 Message-Id: <1353543503-8952-6-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com> References: <1353543503-8952-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH 05/33] imagemagick: explicitly disable c++ support if no c++ compiler available 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 Signed-off-by: Samuel Martin --- package/imagemagick/imagemagick.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 61a379d..365a073 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -35,6 +35,12 @@ IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \ IMAGEMAGICK_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +IMAGEMAGICK_CONF_OPT = --with-magick-plus-plus +else +IMAGEMAGICK_CONF_OPT = --without-magick-plus-plus +endif + ifeq ($(BR2_PACKAGE_FONTCONFIG),y) IMAGEMAGICK_CONF_OPT += --with-fontconfig IMAGEMAGICK_DEPENDENCIES += fontconfig