mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-16 21:36:35 +00:00
Allow Strawberry Perl on Windows with Meson >= 0.60.0
Meson now explicitly blacklists pkg-config.bat from Strawberry Perl and thus building GStreamer on Windows has been fixed. This allows for instance to build GStreamer on GitHub Action Windows runners that have Strawberry Perl by default. It is also useful when needing to build OpenSSL on the same Windows machine because it requires Perl. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1263>
This commit is contained in:
parent
577cdcafe0
commit
1ec04817eb
1 changed files with 2 additions and 2 deletions
|
@ -40,10 +40,10 @@ ensure_no_strawberry_perl = '''
|
|||
import os
|
||||
assert(r'Strawberry\perl\bin' not in os.environ['PATH'])
|
||||
'''
|
||||
if build_system == 'windows'
|
||||
if build_system == 'windows' and meson.version().version_compare('<0.60.0')
|
||||
cmdres = run_command(python3, '-c', ensure_no_strawberry_perl)
|
||||
if cmdres.returncode() != 0
|
||||
error('You have Strawberry Perl in PATH which is known to cause build issues with gst-build. Please remove it from PATH or uninstall it.')
|
||||
error('You have Strawberry Perl in PATH which is known to cause build issues with Meson < 0.60.0. Please remove it from PATH, uninstall it, or upgrade Meson.')
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue