From: Zoltan Gyarmati Date: Mon, 29 Jan 2018 05:38:11 +0000 (+0100) Subject: package/pinentry: avoid building qt5 version if qt4 is enabled X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d3c12b0cfc01081bac42e711c560bf0c1a1e46ca;p=buildroot.git package/pinentry: avoid building qt5 version if qt4 is enabled 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 Signed-off-by: Peter Korsgaard --- 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