From a8d8cba1c18fb5674911a49938c32d8d500f0ecb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Dec 2017 21:30:46 +0000 Subject: [PATCH] Handle C++ flags more neatly. --- cscript | 16 +++++++++++----- wscript | 12 ++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cscript b/cscript index 53e54e8..b9ac538 100644 --- a/cscript +++ b/cscript @@ -31,12 +31,18 @@ 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') or - (target.distro == 'centos' and target.version == '7')): - 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' elif target.platform == 'windows': - cmd += ' --target-windows' + # Similarly with Windows + cmd += ' --force-cpp11 --target-windows' target.command(cmd) target.command('./waf build install') diff --git a/wscript b/wscript index f608c1f..2833bb0 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,6 @@ # -*- mode: python -*- # -# Copyright (C) 2016 Carl Hetherington +# Copyright (C) 2016-2017 Carl Hetherington # # This file is part of libcxml. # @@ -29,10 +29,13 @@ def options(opt): opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to Windows') opt.add_option('--static', action='store_true', default=False, help='build statically') opt.add_option('--disable-tests', action='store_true', default=False, help='disable building of tests') + opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11') def configure(conf): conf.load('compiler_cxx') conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2']) + if conf.options.force_cpp11: + conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) conf.env.TARGET_WINDOWS = conf.options.target_windows conf.env.STATIC = conf.options.static @@ -68,13 +71,6 @@ def configure(conf): conf.recurse('test') - # libxml++ 2.39.1 and later must be built with -std=c++11 - libxmlpp_version = conf.cmd_and_log(['pkg-config', '--modversion', 'libxml++-2.6'], output=Context.STDOUT, quiet=Context.BOTH) - s = libxmlpp_version.split('.') - v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2]) - if v >= 0x022701: - conf.env.append_value('CXXFLAGS', '-std=c++11') - def build(bld): bld(source='libcxml.pc.in', -- 2.30.2