#
-# Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+# Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
#
# This file is part of libsub.
#
option_defaults = { 'force-cpp11': False }
def dependencies(target, options):
- libdcp = ('libdcp', 'e40f5c5', { 'force-cpp11': options['force-cpp11'] })
- libcxml = ('libcxml', 'c333199', { 'force-cpp11': options['force-cpp11'] })
- return (('asdcplib', 'carl'), libcxml, libdcp)
+ return (('asdcplib', '97918d86caf4b5a2296a0d3092f1e2e69b9af9e5'), ('libdcp', 'v1.8.8'))
def build(target, options):
cmd = './waf configure --prefix=%s' % target.directory
if target.debug:
cmd += ' --enable-debug'
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'
+ cmd += f' --target-windows-{target.bits} --disable-tests'
target.command(cmd)
target.command('./waf build install')