diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-09 23:23:37 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-08-13 01:51:07 +0530 |
| commit | bc2305e1ac044e338fa51f26041914f65184b737 (patch) | |
| tree | 6dcd102f37c4ef7ad8b1f140ac05320222551256 | |
| parent | 2a978172a87828680985355512b184fa36e0a912 (diff) | |
| download | meson-bc2305e1ac044e338fa51f26041914f65184b737.zip meson-bc2305e1ac044e338fa51f26041914f65184b737.tar.gz meson-bc2305e1ac044e338fa51f26041914f65184b737.tar.bz2 | |
dependencies: reject Qt6 pkg-config dependency if libexecdir is not known
This is needed for 6.1 support as noted in commit
a606ce22eb0dd05eef56384d59954edad7da131d but at the time there was no
pkg-config detection method at all. The stub code for Qt6 didn't support
libexecdir at all, and the pkg-config files added to newer versions of
Qt6 didn't export that information either until a further bugfix release.
Enforce that this information is required.
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index 750ae42..ea8b849 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -433,6 +433,13 @@ class Qt5PkgConfigDependency(QtPkgConfigDependency): class Qt6PkgConfigDependency(QtPkgConfigDependency): + def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]): + super().__init__(name, env, kwargs) + if not self.libexecdir: + mlog.debug(f'detected Qt6 {self.version} pkg-config dependency does not ' + 'have proper tools support, ignoring') + self.is_found = False + @staticmethod def get_pkgconfig_host_bins(core: PkgConfigDependency) -> str: return core.get_pkgconfig_variable('bindir', [], None) |