Tidy deps and pin asdcplib.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 626d85e7fadfd278b5cd2575be63c9bd11e54848..efa5fd2c56ba4d85c299111d842ecd9d803b3ff1 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,7 +1,28 @@
+#
+#    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libsub.
+#
+#    libsub is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    libsub is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with libsub.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', '6648afc'), ('libcxml', 'v0.16.1'), ('libdcp', 'v1.6.4'))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    return (('asdcplib', 'bb09615'), ('libdcp', 'ac98ff1'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,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':