X-Git-Url: https://main.carlh.net/gitweb/?p=libsub.git;a=blobdiff_plain;f=cscript;h=9b4d0186ef4d4e5a5c360e813b69c5187a1ff39a;hp=6eabaeaf3bea57b77e499b31c72852e9ea67aece;hb=3fd82fc8456a9d0b6725104f14f1eb90bd06096f;hpb=f43148f72cb19dfb2d1f1f80d87bbe24641d481c

diff --git a/cscript b/cscript
index 6eabaea..9b4d018 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libsub.
 #
@@ -19,8 +19,10 @@
 
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', '6648afc'), ('libcxml', '670c528'), ('libdcp', '097f27f'))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    return (('asdcplib', 'bb09615'), ('libdcp', 'c59e6c0'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -28,15 +30,6 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-            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':