aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2015-02-04 01:34:15 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-02-07 21:22:55 +0100
commit454c31103b3c42efd8b32ec3b440afa0e24879ee (patch)
treefd0035b437364a7227ecbe8bc4f998d2532fc611
parent0a91527b657458534b3b781bfb03b326d1725f7d (diff)
downloadbuildroot-454c31103b3c42efd8b32ec3b440afa0e24879ee.tar.gz
buildroot-454c31103b3c42efd8b32ec3b440afa0e24879ee.tar.bz2
pinenty: add missing indirect dependency on atomics for gtk2 support
Also remove redundant comment lines. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pinentry/Config.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in
index ae7025777f..350327a226 100644
--- a/package/pinentry/Config.in
+++ b/package/pinentry/Config.in
@@ -18,13 +18,12 @@ config BR2_PACKAGE_PINENTRY_NCURSES
config BR2_PACKAGE_PINENTRY_GTK2
bool "pinentry-gtk2"
- # propagate libgtk2's dependencies
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
depends on BR2_INSTALL_LIBSTDCPP
- # select libgtk2
+ depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo
select BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
@@ -32,17 +31,16 @@ config BR2_PACKAGE_PINENTRY_GTK2
comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++"
depends on BR2_USE_MMU
+ depends on BR2_ARCH_HAS_ATOMICS
depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \
!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_PINENTRY_QT4
bool "pinentry-qt4"
- # propagate qt's dependencies
depends on !BR2_avr32 # lacks TLS
depends on BR2_USE_MMU # fork
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
- # select qt
select BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE
help