More build fixes.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 73e9eebeaa74035db6a261eaddd7dde8db5c3cb1..69458900b88142d13a7b79671897324854e00840 100644 (file)
--- a/cscript
+++ b/cscript
@@ -236,9 +236,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'aab2fb1', ffmpeg_options),
-            ('libdcp', '89d5fe1'),
-            ('libsub', '96ea6d2'))
+    return (('ffmpeg-cdist', '1d4a1a4', ffmpeg_options),
+            ('libdcp', 'eec238a'),
+            ('libsub', '067c21c'))
 
 def configure_options(target):
     opt = ''
@@ -337,7 +337,10 @@ def package_rpm(target, cpu, version):
     if cpu == "amd64":
         cpu = "x86_64"
     else:
-        cpu = "i686"
+        if target.distro == 'centos' and target.version == '5':
+            cpu = "i386"
+        else:
+            cpu = "i686"
 
     print('Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu))
     for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
@@ -378,7 +381,9 @@ def make_manual(target):
 def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        if test is None:
-            target.command('run/tests')
-        else:
-            target.command('run/tests --run_test=%s' % test)
+        cmd = 'run/tests '
+        if target.debug:
+            cmd += '--backtrace '
+        if test is not None:
+            cmd += '--run_test=%s' % test
+        target.command(cmd)