aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-08-09 23:23:37 -0400
committerEli Schwartz <eschwartz@archlinux.org>2022-08-09 23:29:21 -0400
commit90818ca24a8d34ce8957bb2632d658ba97097206 (patch)
tree7deaa51c584bea1f175115f12946ada0ff3b05cd
parent49ccf8124aaeda435ec8cd31167418370e36441d (diff)
downloadmeson-90818ca24a8d34ce8957bb2632d658ba97097206.zip
meson-90818ca24a8d34ce8957bb2632d658ba97097206.tar.gz
meson-90818ca24a8d34ce8957bb2632d658ba97097206.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.py7
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)