Bump libdcp for openjpeg Windows ccache fixes.

[libsub.git] / cscript

diff --git a/cscript b/cscript
index 0d77e365832f973a9b4c73b6d98e9d17c04fab6a..c9172581d02ff7b3eb32f81413307850d8fd4614 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,12 @@
 
 import os
 
-def dependencies(target):
-    return (('asdcplib-cth', 'd8490c6'), ('libcxml', '0d18df4'), ('libdcp', None))
+option_defaults = { 'force-cpp11': False }
+
+def dependencies(target, options):
+    libdcp =  ('libdcp', '1055451', { 'force-cpp11': options['force-cpp11'] })
+    libcxml = ('libcxml', '2b8b650', { 'force-cpp11': options['force-cpp11'] })
+    return (('asdcplib', 'carl'), libcxml, libdcp)
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -28,20 +32,25 @@ 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'
 
+    # 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')