X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=f163df13157b2120fdc1669a6185f8f6fa80a14a;hb=5a3faa7fe5c6cb94572645b7b81ae0393aede0eb;hp=9a827e22e93b8bc31170ac072db0e45a59e993cc;hpb=b92c8d34405800c33a526e1d3b42ddb6398a4597;p=libsub.git

diff --git a/cscript b/cscript
index 9a827e2..f163df1 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('libdcp', '1f18188'),)
+    return (('asdcplib-cth', 'b536bc0'), ('libcxml', 'a45e430'), ('libdcp', 'f380b96'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,8 +9,15 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if target.distro == 'debian' and target.version == 'unstable':
-            target.append_with_space('CXXFLAGS', '-std=c++11')
+            if target.version == '7':
+            	# Centos 7 ships with glibmm 2.50.0 which requires C++11
+                # but its compiler (gcc 4.8.5) defaults to C++97.  Go figure.
+                # I worry that this will cause ABI problems but I don't have
+                # a better solution.
+                cmd += ' --force-cpp11'
+        if target.distro == 'mageia' and target.version == '6':
+            # Mageia 6 pulls the same stunt except it's libxml++ that requires C++11
+            cmd += ' --force-cpp11'
     if target.debug:
         cmd += ' --enable-debug'
     if target.platform == 'windows':
@@ -24,7 +31,10 @@ def make_doxygen(target):
     target.command('doxygen')
     return os.path.abspath('build/doc/html')
 
-def test(target):
+def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
-        target.command('run/tests')
+        if test is None:
+            target.command('run/tests')
+        else:
+            target.command('run/tests --run_test=%s' % test)