From patchwork Thu Dec 6 15:12:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 204275 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 997012C01C2 for ; Fri, 7 Dec 2012 02:14:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 239B5A0251; Thu, 6 Dec 2012 15:14:05 +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 kwdQwPaoosbO; Thu, 6 Dec 2012 15:14:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B966FA0245; Thu, 6 Dec 2012 15:14:01 +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 021E98F74A for ; Thu, 6 Dec 2012 15:14:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C4A898064C for ; Thu, 6 Dec 2012 15:14:00 +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 b7XvJBvsI6n2 for ; Thu, 6 Dec 2012 15:13:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4332680820 for ; Thu, 6 Dec 2012 15:13:59 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id ds1so316996wgb.4 for ; Thu, 06 Dec 2012 07:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=dB4NT8YTjId7lcsaPOOcxI95iqUoiO8YzX4E8/0LJLc=; b=sY/j7XQF2Mdg9aLjYpuX2vQXvNn0+KiI/iOkStLibr+mu4o8uJMaEpQDDVnh8V+j+7 bHqTeIurVKCxNVybBKtoVyGsqdPlMAx2UvXvvKMHJ/R1tJWaJOZaTpRr2ELaMoJn2WyB pOvCEEXsVZ5GsdCtaoPeaRslPQz7imBDVOC/KaVwE3tJ8lfDsBD8R1bjQPP59klOiwYd rokUqcV5aPUHFOrCRj0mYM9wXCh/xJS4PTdBHWAcA4jO+n+U+bhdz+gZl1Y5jXr/ufvQ 1EduN8WGkN7Goug2eQqrOVcPWNrddWN/kJPSxBOrJT+40Dn12woANSyvMKyRrUb21zcf EaMA== Received: by 10.216.141.134 with SMTP id g6mr785827wej.52.1354806837314; Thu, 06 Dec 2012 07:13:57 -0800 (PST) Received: from localhost.localdomain (host-84-13-96-11.opaltelecom.net. [84.13.96.11]) by mx.google.com with ESMTPS id dm3sm23471694wib.9.2012.12.06.07.13.55 (version=SSLv3 cipher=OTHER); Thu, 06 Dec 2012 07:13:56 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Thu, 6 Dec 2012 15:12:50 +0000 Message-Id: <1354806770-1673-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] sconeserver: fix imagemagick build failures 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 From: Simon Dawson The sconeserver configure script uses Magick++-config to obtain compiler and linker arguments for the imagemagick libraries. This doesn't work in Buildroot, and causes build failures such as the following http://autobuild.buildroot.net/results/7833edd60bbb2c291aea1efb5ccf407da7f4a51f/build-end.log The upstream sconeserver code has been changed to use pkg-config directly, instead of Magick++-config; this patch adapts the sconeserver package to the upstream change. Both this patch and the associated upstream change are based on a Buildroot patch submitted by Samuel Martin: http://patchwork.ozlabs.org/patch/200901/ Signed-off-by: Simon Dawson --- package/sconeserver/sconeserver.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 15a1edc..ab3d1fc 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -5,7 +5,7 @@ ############################################################# # Release 0.6.0 doesn't build cleanly, so use a recent # Subversion trunk snapshot. -SCONESERVER_VERSION = 180 +SCONESERVER_VERSION = 183 SCONESERVER_SITE = \ https://sconeserver.svn.sourceforge.net/svnroot/sconeserver/trunk SCONESERVER_SITE_METHOD = svn @@ -51,7 +51,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