From: Gustavo Zacarias Date: Thu, 15 Oct 2015 12:48:50 +0000 (-0300) Subject: sconeserver: use direct imagemagick disable X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a41594ae2c1c9f5d773162e42bd992dbc21c16d1;p=buildroot.git sconeserver: use direct imagemagick disable Disabling sconesite image isn't enough to avoid imagemagick autodetection, and if it's present in the host (distro) but not in the target it gets automatically picked up. Fixes: http://autobuild.buildroot.net/results/377/37705926f3023395c54af0532ff95f0125fbaa66/ Also add a comment about autoreconf. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index beca926f7d..2072142c2d 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,7 +10,7 @@ SCONESERVER_VERSION = 3b886c3dda6eda39bcb27472d29ed7fd3185ba1d SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION)) SCONESERVER_LICENSE = GPLv2+ SCONESERVER_LICENSE_FILES = COPYING - +# For 0001-fix-ssl-libs-ordering.patch and configure isn't up to date SCONESERVER_AUTORECONF = YES SCONESERVER_DEPENDENCIES += pcre SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 @@ -50,7 +50,7 @@ SCONESERVER_CONF_OPTS += \ --with-sconesite-image \ --with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config" else -SCONESERVER_CONF_OPTS += --without-sconesite-image +SCONESERVER_CONF_OPTS += --without-sconesite-image --with-Magick++-config=no endif ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)