summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-07-15 17:52:05 +0100
committerCarl Hetherington <cth@carlh.net>2014-07-15 17:52:05 +0100
commit0337475d923422f160e000020f320c8c97524a02 (patch)
tree491565f2f94faf6106f259d2fe2744f0b4a49e52 /cscript
parent1eae64b992a0a753d2463cac386cb5cd3597cd30 (diff)
parentcd4ad2186dba563db5b803963a86501f0b1e60f9 (diff)
Merge centos-hacks,.
Diffstat (limited to 'cscript')
-rw-r--r--cscript7
1 files changed, 5 insertions, 2 deletions
diff --git a/cscript b/cscript
index af2b749ca..5ea5a4cfd 100644
--- a/cscript
+++ b/cscript
@@ -157,7 +157,7 @@ def make_control(debian_version, bits, filename, debug):
def dependencies(target):
return (('ffmpeg-cdist', '67dc770'),
- ('libdcp', '563c7fd'))
+ ('libdcp', '009e07f'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.work_dir_cscript()
@@ -169,7 +169,10 @@ def build(target, options):
if target.version == 'unstable':
cmd += ' --debian-unstable'
elif target.distro == 'centos':
- cmd += ' --target-centos'
+ if target.version == '6.5':
+ cmd += ' --target-centos-6 --disable-tests'
+ elif target.version == '7':
+ cmd += ' --target-centos-7'
target.command(cmd)
target.command('./waf')