X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=af1793ae15b4f9c371d6ece517ed3da1395caad9;hb=c333199bba3de3955af2c5f2debaa5c4bf9faa43;hp=8c90300621922a2c2c88006f5895f0aa4e3d18c2;hpb=8bdbeb17890d3d7a58473dc2caa4824e91411c8b;p=libcxml.git

diff --git a/cscript b/cscript
index 8c90300..af1793a 100644
--- a/cscript
+++ b/cscript
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 #
-#    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+#    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 #
 #    This file is part of libcxml.
 #
@@ -20,8 +20,7 @@
 
 import os
 
-def dependencies(target):
-    return (('locked_sstream', None),)
+option_defaults = { 'force-cpp11': False }
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -31,10 +30,25 @@ def build(target, options):
             # Centos builds using static boost, which means tests don't
             # build as test/tests.cc defines BOOST_TEST_DYN_LINK
             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')
     elif target.platform == 'windows':
         cmd += ' --target-windows'
+
+    # 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 target.platform == 'windows':
+        force_cpp11 = True
+    if force_cpp11 or options['force-cpp11']:
+        cmd += ' --force-cpp11'
+
     target.command(cmd)
     target.command('./waf build install')