forked from pool/meson
Dominique Leuenberger
11d1a88ea8
Update to 0.53.1 OBS-URL: https://build.opensuse.org/request/show/766999 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=154
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
|
|
index eec8728e..c02223a0 100644
|
|
--- meson.build
|
|
+++ meson.build
|
|
@@ -35,28 +35,14 @@ python3dep = python3.dependency(required: host_machine.system() == 'linux', embe
|
|
|
|
# compile python 2/3 modules only if we found a corresponding python version
|
|
if(python2dep.found() and host_machine.system() == 'linux')
|
|
- if(dep.version().version_compare('>=1.67'))
|
|
- # if we have a new version of boost, we need to construct the module name based
|
|
- # on the installed version of python (and hope that they match the version boost
|
|
- # was compiled against)
|
|
- py2version_string = ''.join(python2dep.version().split('.'))
|
|
- bpython2dep = dependency('boost', modules : ['python' + py2version_string], required: false, disabler: true)
|
|
- else
|
|
- # if we have an older version of boost, we need to use the old module names
|
|
- bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true)
|
|
- endif
|
|
+ bpython2dep = dependency('boost', modules : ['python'], required: false, disabler: true)
|
|
else
|
|
python2dep = disabler()
|
|
bpython2dep = disabler()
|
|
endif
|
|
|
|
if(python3dep.found() and host_machine.system() == 'linux')
|
|
- if(dep.version().version_compare('>=1.67'))
|
|
- py3version_string = ''.join(python3dep.version().split('.'))
|
|
- bpython3dep = dependency('boost', modules : ['python' + py3version_string], required: false, disabler: true)
|
|
- else
|
|
- bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true)
|
|
- endif
|
|
+ bpython3dep = dependency('boost', modules : ['python3'], required: false, disabler: true)
|
|
else
|
|
python3dep = disabler()
|
|
bpython3dep = disabler()
|