summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-10-15 09:48:50 -0300
committerPeter Korsgaard <peter@korsgaard.com>2015-10-15 22:23:07 +0200
commita41594ae2c1c9f5d773162e42bd992dbc21c16d1 (patch)
tree0dc949009b79d9624c1c8f743463cbafaf1cf4df
parent5e3da92d7e95c88c088384ed1422f6f257106d90 (diff)
downloadbuildroot-a41594ae2c1c9f5d773162e42bd992dbc21c16d1.tar.gz
buildroot-a41594ae2c1c9f5d773162e42bd992dbc21c16d1.zip
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 <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/sconeserver/sconeserver.mk4
1 files changed, 2 insertions, 2 deletions
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)
OpenPOWER on IntegriCloud