aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>2018-01-29 06:38:11 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-01-31 12:07:28 +0100
commit6eda76eb859863c2a960d6cb01e0730ec2051188 (patch)
tree14c53d0c9d92d9fb114124f4dd6fd66e4f4b12e2
parent77d0d20796f52cfb3492df621a09d8ff0a01d019 (diff)
downloadbuildroot-6eda76eb859863c2a960d6cb01e0730ec2051188.tar.gz
buildroot-6eda76eb859863c2a960d6cb01e0730ec2051188.tar.bz2
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 <mr.zoltan.gyarmati@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit d3c12b0cfc01081bac42e711c560bf0c1a1e46ca) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pinentry/Config.in1
1 files changed, 1 insertions, 0 deletions
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