Tidy deps and pin asdcplib.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 26fbe51cc3339a3b7fb585ae32bb56a0abcc935a..efa5fd2c56ba4d85c299111d842ecd9d803b3ff1 100644 (file)
--- 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.
 #
@@ -22,9 +22,7 @@ import os
 option_defaults = { 'force-cpp11': False }
 
 def dependencies(target, options):
-    libdcp =  ('libdcp', '25526a5', { 'force-cpp11': options['force-cpp11'] })
-    libcxml = ('libcxml', 'c333199', { 'force-cpp11': options['force-cpp11'] })
-    return (('asdcplib', 'carl'), libcxml, libdcp)
+    return (('asdcplib', 'bb09615'), ('libdcp', 'ac98ff1'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -37,20 +35,6 @@ def build(target, options):
     if target.platform == 'windows':
         cmd += ' --target-windows --disable-tests'
 
-    # 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.  Mageia 6 pulls the same stunt except it's
-    # libxml++ that requires C++11
-    force_cpp11 = False
-    if target.platform == 'linux':
-        if target.distro == 'centos' and target.version == '7':
-            force_cpp11 = True
-        if target.distro == 'mageia' and target.version == '6':
-            force_cpp11 = True
-    if force_cpp11 or options['force-cpp11']:
-        cmd += ' --force-cpp11'
-
     target.command(cmd)
     target.command('./waf build install')