Fix binary STL output with subs that are too big for a single TTI block.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 32ec8eedb1c9ba9458eb7176ea8c7bb8c11c53f6..4ae23f7bd529144f1e0649e590f03c0db32047c7 100644 (file)
--- a/cscript
+++ b/cscript
@@ -1,5 +1,5 @@
 #
-#    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libsub.
 #
@@ -19,8 +19,9 @@
 
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', '6648afc'), ('libcxml', 'caa3f20'), ('libdcp', '6c0c06a'))
+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))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -29,7 +30,7 @@ def build(target, options):
         if target.distro == 'centos':
             cmd += ' --disable-tests'
             if target.version == '7':
-               # Centos 7 ships with glibmm 2.50.0 which requires C++11
+                # 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.
@@ -42,6 +43,9 @@ def build(target, options):
     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')