[Buildroot] [git commit] package/pinentry: avoid building qt5 version if qt4 is enabled

Peter Korsgaard peter at korsgaard.com
Mon Jan 29 19:57:42 UTC 2018


commit: https://git.buildroot.net/buildroot/commit/?id=d3c12b0cfc01081bac42e711c560bf0c1a1e46ca
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

BR2_PACKAGE_PINENTRY_QT5 selects BR2_PACKAGE_QT5, which can lead to Qt
version clash if otherwise Qt4 is selected as well. Making
BR2_PACKAGE_PINENTRY_QT5 depending on !BR2_PACKAGE_QT to avoid this.

Fixes:
     http://autobuild.buildroot.net/results/3c537e1260dc9ce57657ca0d49e318a10aee111e

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/pinentry/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index 781901bbaf..5f2cb58fbb 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -63,6 +63,7 @@ config BR2_PACKAGE_PINENTRY_QT5
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_PACKAGE_PINENTRY_QT4
+	depends on !BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS


More information about the buildroot mailing list