summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-21 19:14:58 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-21 19:14:58 +0100
commitcb990adba9c57e5107ef2aa9716cf0a26c1df83d (patch)
treee59571d05db47b6f1070c85331ba351fd2794adf /cscript
parent8a19e2b56d3b95a18ae8ac9965eab750c28d30ad (diff)
parent5c8599593ee8b3ef05d5c55c5f0885a2d8bfb9d2 (diff)
Merge master.
Diffstat (limited to 'cscript')
-rw-r--r--cscript3
1 files changed, 1 insertions, 2 deletions
diff --git a/cscript b/cscript
index 795cf0a35..a5c0900c1 100644
--- a/cscript
+++ b/cscript
@@ -8,7 +8,6 @@ deb_build_depends = {'debhelper': '8.0.0',
'pkg-config': '0.26',
'libssh-dev': '0.5.2',
'libsndfile1-dev': '1.0.25',
- 'libmagick++-dev': '8:6.6.9.7',
'libgtk2.0-dev': '2.24.10'}
deb_depends = dict()
@@ -173,7 +172,7 @@ def build(target, options):
if target.version == '6.5':
cmd += ' --target-centos-6 --disable-tests'
elif target.version == '7':
- cmd += ' --target-centos-7'
+ cmd += ' --target-centos-7 --disable-tests'
target.command(cmd)
target.command('./waf')