Message ID | 1354806770-1673-1-git-send-email-spdawson@gmail.com |
---|---|
State | Accepted |
Commit | 6b8bbd323b01281a9eee7c58ca0a9ac9230f545e |
Headers | show |
>>>>> "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.
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