Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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>
Zoltan Gyarmati 7 years ago
parent
77d0d20796
commit
6eda76eb85
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      package/pinentry/Config.in

+ 1 - 0
package/pinentry/Config.in
View File 

@@ -63,6 +63,7 @@ config BR2_PACKAGE_PINENTRY_QT5
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 	depends on !BR2_STATIC_LIBS
 
 	depends on !BR2_STATIC_LIBS
 
 	depends on !BR2_PACKAGE_PINENTRY_QT4
 
 	depends on !BR2_PACKAGE_PINENTRY_QT4
 
+	depends on !BR2_PACKAGE_QT
 
 	select BR2_PACKAGE_QT5
 
 	select BR2_PACKAGE_QT5
 
 	select BR2_PACKAGE_QT5BASE_GUI
 
 	select BR2_PACKAGE_QT5BASE_GUI
 
 	select BR2_PACKAGE_QT5BASE_WIDGETS
 
 	select BR2_PACKAGE_QT5BASE_WIDGETS