From 415850673d8a14dec085f426ad1185da31bc6e49 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Dec 2017 21:58:01 +0000 Subject: Try to tidy up C++11 hacks. --- cscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index beb64132..973bc06a 100644 --- a/cscript +++ b/cscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2016 Carl Hetherington +# Copyright (C) 2012-2017 Carl Hetherington # # This file is part of libdcp. # @@ -47,8 +47,6 @@ 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') elif target.platform == 'windows': cmd += ' --target-windows --disable-gcov --disable-tests' if target.version == 'xp': -- cgit v1.2.3 From 2137d41ec8256b316103449881d7bbfdbef309fb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 9 Dec 2017 22:29:38 +0000 Subject: Fixes for the bad distros. --- cscript | 9 +++++++++ wscript | 3 +++ 2 files changed, 12 insertions(+) (limited to 'cscript') diff --git a/cscript b/cscript index 973bc06a..01e1ef16 100644 --- a/cscript +++ b/cscript @@ -47,6 +47,15 @@ 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' elif target.platform == 'windows': cmd += ' --target-windows --disable-gcov --disable-tests' if target.version == 'xp': diff --git a/wscript b/wscript index 3e041517..47085046 100644 --- a/wscript +++ b/wscript @@ -51,10 +51,13 @@ def options(opt): opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples') opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP') opt.add_option('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively') + 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', '-D_FILE_OFFSET_BITS=64', '-D__STDC_FORMAT_MACROS']) + if conf.options.force_cpp11: + conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS']) gcc = conf.env['CC_VERSION'] if int(gcc[0]) >= 4 and int(gcc[1]) > 1: conf.env.append_value('CXXFLAGS', ['-Wno-maybe-uninitialized']) -- cgit v1.2.3 From 0c70427392b086e0dee3b3376e6b492701dbd871 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 10 Dec 2017 00:38:53 +0000 Subject: Bump libcxml. --- cscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 01e1ef16..d15cdf28 100644 --- a/cscript +++ b/cscript @@ -35,9 +35,9 @@ import os def dependencies(target, options): if (target.platform == 'windows' and target.version == 'xp') or (options is not None and 'jpeg' in options and options['jpeg'] == 'oj1'): - return (('libcxml', '25e945f'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', 'f3b0fb8')) + return (('libcxml', 'a8d8cba'), ('openjpeg-cdist', '4233dd7'), ('asdcplib-cth', 'f3b0fb8')) else: - return (('libcxml', '25e945f'), ('openjpeg2-cdist', '4ce711a'), ('asdcplib-cth', 'f3b0fb8')) + return (('libcxml', 'a8d8cba'), ('openjpeg2-cdist', '4ce711a'), ('asdcplib-cth', 'f3b0fb8')) def build(target, options): cmd = './waf configure --disable-examples --prefix=%s' % target.directory -- cgit v1.2.3