X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=ac0467e6d36d160c9a99f79744083b7170617a9d;hb=2bbddc66e34dd8b18a8a53add6149021aa19e6d9;hp=4ae23f7bd529144f1e0649e590f03c0db32047c7;hpb=a9a6950b0de7bfa4569ef268fae3c487be6e511d;p=libsub.git

diff --git a/cscript b/cscript
index 4ae23f7..ac0467e 100644
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libsub.
 #
@@ -19,9 +19,10 @@
 
 import os
 
+option_defaults = { 'force-cpp11': False }
+
 def dependencies(target, options):
-    libdcp_options = { 'force-cpp11': options['force-cpp11'] } if 'force-cpp11' in options else {}
-    return (('asdcplib', 'carl'), ('libcxml', '0d18df4'), ('libdcp', None, libdcp_options))
+    return (('asdcplib', 'bb09615'), ('libdcp', '3a328b6'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -29,23 +30,11 @@ 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':
         cmd += ' --target-windows --disable-tests'
 
-    if options is not None and 'force-cpp11' in options and options['force-cpp11']:
-        cmd += ' --force-cpp11'
-
     target.command(cmd)
     target.command('./waf build install')