From patchwork Thu Nov 22 00:18:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 200901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id E799A2C008C for ; Thu, 22 Nov 2012 11:20:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6D38CA001B; Thu, 22 Nov 2012 00:20:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gruTGSQGz2pI; Thu, 22 Nov 2012 00:20:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 307E5A01CE; Thu, 22 Nov 2012 00:20:30 +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 438728F74A for ; Thu, 22 Nov 2012 00:19:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 182A6827A7 for ; Thu, 22 Nov 2012 00:19:30 +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 31CqaH65esWe for ; Thu, 22 Nov 2012 00:19:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 36B758CE36 for ; Thu, 22 Nov 2012 00:19:00 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id u3so578127wey.16 for ; Wed, 21 Nov 2012 16:19:00 -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=feS74OMRvY0wlUCUjKPHMbBAZwvvSVsFeWcTecliqLA=; b=vV9+WA3Jcmw+yF9bd2cCo1sgvk2QL+ahVvh3m+WLBtFpK5JtZW/unj3AQc00eHqYKK 6+7uM+ib1sT+7XX95bizJ0h2s01HVKCd1qT5/vGTYFNmh6BJbvR2SImsdHPgnKtRF1hV Cck9X9aGHQKUkRo0CpfqqMrnwI2R7FRC0sToROPHuRoQYKB8wBZZ7HMY2BxCqcahFcqF 2GuCWUzSZgf+RFiKpfUugR8MRe4RrmBNq9S9cPaiPb2f41TvIXYUuYTRsx76bEaD83Bc M4qhxd4lSnlCIEM9pubp9K58hybWIQCxiX7XeqotuLJ65tAtww0M2uU3YOao9J6dKX/e ku9Q== Received: by 10.216.204.72 with SMTP id g50mr7729235weo.160.1353543540241; Wed, 21 Nov 2012 16:19:00 -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.58 (version=SSLv3 cipher=OTHER); Wed, 21 Nov 2012 16:18:59 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Thu, 22 Nov 2012 01:18:03 +0100 Message-Id: <1353543503-8952-14-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 13/33] sconeserver: fix imagemagick dependency 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 * only depends on imagemagick when C++ support is enable * use 'pkg-config Magick++' instead of Magick++-config Fixes: http://autobuild.buildroot.net/results/e8a71a731dafb2eaee0454b5b1a51cd6de4ecdc6/build-end.log Signed-off-by: Samuel Martin --- package/sconeserver/Config.in | 3 ++ ...-dependency-use-pkg-config-instead-of-Mag.patch | 41 ++++++++++++++++++++++ package/sconeserver/sconeserver.mk | 2 +- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index a7e5c75..74722a0 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -26,6 +26,9 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE bool "http::sconesite::image" depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE + # sconesite-image requires Magick++.h which is only available if + # C++ compiler is working. + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_IMAGEMAGICK help http::sconesite::image module for Sconeserver diff --git a/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch new file mode 100644 index 0000000..58298c8 --- /dev/null +++ b/package/sconeserver/sconeserver-180-ImageMagick-dependency-use-pkg-config-instead-of-Mag.patch @@ -0,0 +1,41 @@ +From 278cacf17370756a1d620ffa8898c889051d19bf Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sat, 17 Nov 2012 18:18:17 +0100 +Subject: [PATCH 1/1] ImageMagick dependency: use pkg-config instead of + Magick++-config + +Magick++-config is nothing more than a wrapper using pkg-config. + +Signed-off-by: Samuel Martin +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 241e66b..936130f 100644 +--- a/configure.in ++++ b/configure.in +@@ -185,7 +185,7 @@ fi + + # Look for ImageMagick settings + AC_CHECK_LIB([Magick++],[InitializeMagick], +- [CPPFLAGS="$CPPFLAGS `Magick++-config --cppflags`"],, ++ [CPPFLAGS="$CPPFLAGS `pkg-config Magick++ --cflags`"],, + ) + + # Sconesite:image module +@@ -202,9 +202,9 @@ if test "x$SCONESITE_IMAGE" == "xyes"; then + if test "x$ac_cv_lib_Magickpp_InitializeMagick" != "xyes"; then + AC_MSG_ERROR([library 'Magick++' is required for Sconesite:image]) + fi +- SCONESITE_IMAGE_LIBADD=`Magick++-config --libs` ++ SCONESITE_IMAGE_LIBADD=`pkg-config Magick++ --libs` + AC_SUBST(SCONESITE_IMAGE_LIBADD) +- SCONESITE_IMAGE_LDFLAGS=`Magick++-config --ldflags` ++ SCONESITE_IMAGE_LDFLAGS=`pkg-config Magick++ --libs` + AC_SUBST(SCONESITE_IMAGE_LDFLAGS) + fi + +-- +1.8.0 + diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index d6c9639..aa5688a 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -53,7 +53,7 @@ else endif ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) - SCONESERVER_DEPENDENCIES += imagemagick + SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf SCONESERVER_CONF_OPT += --with-sconesite-image else SCONESERVER_CONF_OPT += --without-sconesite-image