diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2019-12-13 10:46:20 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2019-12-13 10:48:04 +0200 |
commit | 10707f437f2fc3632067c6a0efa4432f7ebaf362 (patch) | |
tree | 3096621816008d7a2ec579bc90c8c243e73a5e60 | |
parent | 986d6d12fb56f08f4acbdb75a0637018849418fa (diff) |
Fix build with Python 3.8 by also checking for python-3.X-embed.pc
Since Python 3.8 the normal checks don't include the Python libraries
anymore and linking of the gst-python module would fail.
See also https://github.com/mesonbuild/meson/issues/5629
Fixes https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28
-rw-r--r-- | meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 5f13b48..d7c7e66 100644 --- a/meson.build +++ b/meson.build @@ -24,10 +24,17 @@ pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_d pymod = import('python') python = pymod.find_installation(get_option('python')) -if python.language_version().version_compare('<3.0') +pythonver = python.language_version() +if pythonver.version_compare('<3.0') error('Python2 is not supported anymore, please port your code to python3 (@0@ specified)'.format(python.language_version())) endif -python_dep = python.dependency(required : true) + +# Workaround for https://github.com/mesonbuild/meson/issues/5629 +# https://gitlab.freedesktop.org/gstreamer/gst-python/issues/28 +python_dep = dependency('python-@0@-embed'.format(pythonver), version: '>=3', required: false) +if not python_dep.found() + python_dep = python.dependency(required : true) +endif python_abi_flags = python.get_variable('ABIFLAGS', '') pylib_loc = get_option('libpython-dir') |