From 47727a7c80b60a0fd0ce18d8347b14241fc48f97 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 20 Dec 2020 14:11:13 +0100 Subject: std::shared_ptr --- cscript | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 367bebe..a420b98 100644 --- a/cscript +++ b/cscript @@ -22,8 +22,8 @@ import os option_defaults = { 'force-cpp11': False } def dependencies(target, options): - libdcp = ('libdcp', 'c6665c1', { 'force-cpp11': options['force-cpp11'] }) - libcxml = ('libcxml', 'c333199', { 'force-cpp11': options['force-cpp11'] }) + libdcp = ('libdcp', '0f1034f') + libcxml = ('libcxml', 'c336f86') return (('asdcplib', 'carl'), libcxml, libdcp) def build(target, options): @@ -37,20 +37,6 @@ def build(target, options): if target.platform == 'windows': cmd += ' --target-windows --disable-tests' - # 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 force_cpp11 or options['force-cpp11']: - cmd += ' --force-cpp11' - target.command(cmd) target.command('./waf build install') -- cgit v1.2.3