X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=b30a1478f4df879a8c7b6eae2742a1fc29d9f6f5;hb=debe9fb034de72ec94eb54194c14d335ff3ca282;hp=94a26d15decca79bb23d38233889902e6f88bf19;hpb=8be82fcdcedcad8e22cd4065f2fea1b03e737826;p=libsub.git

diff --git a/cscript b/cscript
index 94a26d1..b30a147 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,7 @@
 import os
 
 def dependencies(target):
-    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', '25e945f'), ('libdcp', '5e6d583'))
+    return (('asdcplib-cth', 'f3b0fb8'), ('libcxml', 'v0.15.5'), ('libdcp', '623e197'))
 
 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' or target.distro == 'fedora' and target.version == '23'):
-            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':