diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-12-05 00:34:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-12-05 00:34:52 +0100 |
| commit | 6b2a0be7d5129aafd5e17ff3bf80d69a1b14af5b (patch) | |
| tree | 5e533f91eadb7b72dece412ca57a6b36d5f550b4 | |
| parent | ddfee3bb5861be8a6d29070e2ebce7d8f54841b8 (diff) | |
Fix use of atleast_version which these days does nothing.v1.8.36
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -35,7 +35,7 @@ import os import shutil def dependencies(target, options): - return (('libcxml', 'v0.17.4'), ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b')) + return (('libcxml', 'v0.17.5'), ('openjpeg', 'a1403c2'), ('asdcplib', 'ae75eb417d3804a6d723e2cf09647b54b15df5db')) def build(target, options): cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory @@ -150,7 +150,7 @@ def configure(conf): if conf.options.static: conf.env.STLIB_OPENJPEG = ['openjp2'] - conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags', uselib_store='ASDCPLIB_CTH', mandatory=True) conf.env.HAVE_ASDCPLIB_CTH = 1 conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl'] conf.env.HAVE_CXML = 1 @@ -159,8 +159,8 @@ def configure(conf): conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True) conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl'] else: - conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) - conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags --libs', uselib_store='CXML', mandatory=True) + conf.check_cfg(package='libasdcp-carl', args='libasdcp-carl >= 0.1.3 --cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True) + conf.check_cfg(package='libcxml', args='libcxml >= 0.17.0 --cflags --libs', uselib_store='CXML', mandatory=True) conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True) if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: |