Patchwork sconeserver: fix imagemagick build failures

login
register
mail settings
Submitter Simon Dawson
Date Dec. 6, 2012, 3:12 p.m.
Message ID <1354806770-1673-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/204275/
State Accepted
Commit 6b8bbd323b01281a9eee7c58ca0a9ac9230f545e
Headers show

Comments

Simon Dawson - Dec. 6, 2012, 3:12 p.m.
From: Simon Dawson <spdawson@gmail.com>

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 <spdawson@gmail.com>
---
 package/sconeserver/sconeserver.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Peter Korsgaard - Dec. 16, 2012, 12:11 a.m.
>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>

 spdawson> The sconeserver configure script uses Magick++-config to
 spdawson> obtain compiler and linker arguments for the imagemagick
 spdawson> libraries. This doesn't work in Buildroot, and causes build
 spdawson> failures such as the following

 spdawson>   http://autobuild.buildroot.net/results/7833edd60bbb2c291aea1efb5ccf407da7f4a51f/build-end.log

 spdawson> The upstream sconeserver code has been changed to use
 spdawson> pkg-config directly, instead of Magick++-config; this patch
 spdawson> adapts the sconeserver package to the upstream change.

 spdawson> Both this patch and the associated upstream change are based
 spdawson> on a Buildroot patch submitted by Samuel Martin:
 spdawson> http://patchwork.ozlabs.org/patch/200901/

Committed, thanks.

Patch

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