From b4d2065e41bd3196777190fdc7f2952854c0f312 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Sun, 10 Oct 2021 17:32:00 -0400 Subject: [PATCH] pkg-config: do not ever successfully detect Strawberry Perl. This is broken and terrible and thus completely unusable. Don't torture users by finding pkg-config on Windows, thus permitting the pkg-config lookup of several dependencies that do not actually work -- which then fails at build time. This also breaks CI for the wrapdb, because Strawberry Perl is provided as part of the base image for the OS (yes, even though it is terribly broken!!!) and anything that depends on e.g. zlib will "find" zlib because of this broken disaster, even though it should use the wrapdb subproject of zlib. It is assumed no one actually wants to mix Strawberry Perl and meson. In fact, some projects, such as gst-build, already unconditionally error out if Strawberry Perl is detected in PATH: 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.') Other projects (postgresql) actually do want to build perl extensions, and link to the perl dlls, but absolutely under no circumstances ever want to use its pkg-config implementation. ;) Let's solve this problem by just considering this to not be a valid pkg-config, let the user find another or not have one at all. This change "solves" https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/11 --- mesonbuild/dependencies/pkgconfig.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index 251c83ef092f..1e79fd3f5460 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -424,6 +424,9 @@ def check_pkgconfig(self, pkgbin: ExternalProgram) -> T.Optional[str]: if not pkgbin.found(): mlog.log(f'Did not find pkg-config by name {pkgbin.name!r}') return None + if r'Strawberry\perl\bin' in pkgbin.get_path(): + mlog.log(f'found pkg-config {!r} but it is Strawberry Perl and thus broken. Ignoring...'.format(' '.join(pkgbin.get_command()))) + return None try: p, out = Popen_safe(pkgbin.get_command() + ['--version'])[0:2] if p.returncode != 0: