X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=cscript;h=af1793ae15b4f9c371d6ece517ed3da1395caad9;hb=2b8b650ffa7d1a70f820245d58f9fdebbdd7f310;hp=101da69abc41271b12a2489e465953495c183637;hpb=f93722a185a0b432bbb2f36709c4ea1f1cfd4e19;p=libcxml.git

diff --git a/cscript b/cscript
index 101da69..af1793a 100644
--- a/cscript
+++ b/cscript
@@ -1,3 +1,27 @@
+# -*- mode: python -*-
+#
+#    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libcxml.
+#
+#    libcxml 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.
+#
+#    libcxml 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 libcxml.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+
+option_defaults = { 'force-cpp11': False }
+
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
     if target.platform == 'linux':
@@ -8,10 +32,27 @@ def build(target, options):
             cmd += ' --disable-tests'
     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')
 
-def test(target):
+def test(target, test):
     if target.platform != 'windows':
         target.set('LC_ALL', 'C')
         target.command('./run-tests.sh')