summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-09-04 10:54:42 +0200
committerCarl Hetherington <cth@carlh.net>2024-09-04 10:54:42 +0200
commitda18a662ed3e64fb4b9c8c3db5c5395f5fd69cba (patch)
tree21389b1d540ca590b10fd3b257e1ef5907165224
parenta5d3f9c02094457aff34c7680ffa6c8aa7113820 (diff)
Drop Centos 7 support and fix erroneous use of --static-boost on Centos 9.v1.9.19
-rw-r--r--cscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index 9ad72efa..216a6189 100644
--- a/cscript
+++ b/cscript
@@ -36,7 +36,7 @@ import shutil
def dependencies(target, options):
deps = [
- ('libcxml', 'v0.17.10', options),
+ ('libcxml', 'v0.17.11', options),
('openjpeg', 'ad8edaacd54a862940d0a77c41ecda5858b54d6e'),
('asdcplib', 'v1.0.2')
]
@@ -59,7 +59,7 @@ def build(target, options):
if target.distro != 'ubuntu' or not target.version in ('16.04', '22.04'):
# We only build tests on Ubuntu 16.04 and 22.04
cmd += ' --disable-tests'
- if target.distro == 'centos' or (target.distro == 'ubuntu' and target.version == '16.04'):
+ if target.distro == 'ubuntu' and target.version == '16.04':
cmd += ' --static-boost'
elif target.platform == 'windows':
cmd += f' --target-windows-{target.bits}'