X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=095851edc258a148e466e338018fd1f9089eddbe;hb=38b3791c88352af35033cc528dc2d83d6298ed3e;hp=4e7a3d340edaf3ee2f0293090225828fbf8c2136;hpb=0049046a80ecf22c622afa1d37bb48b9200f0931;p=libsub.git

diff --git a/cscript b/cscript
index 4e7a3d3..095851e 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,26 @@
+#
+#    Copyright (C) 2012-2019 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', 'v0.1.3'), ('libcxml', 'v0.15.4'), ('libdcp', '45fd755'))
+    return (('asdcplib-cth', '6648afc'), ('libcxml', '3c371e9'), ('libdcp', 'd9d7b42'))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -9,8 +28,15 @@ def build(target, options):
         cmd += ' --static'
         if target.distro == 'centos':
             cmd += ' --disable-tests'
-        if (target.distro == 'debian' and target.version == 'unstable' or target.distro == 'fedora' and target.version == '23'):
-            target.append_with_space('CXXFLAGS', '-std=c++11')
+            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':