From 5783a418f4b30931068b81f850fc06cd8d3d9732 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 15 Mar 2022 21:49:12 +0100 Subject: [PATCH] package/gcr: depends on !gnupg Since gcr selects gnupg2, it's incompatible with gnupg. Add this dependency and corresponding comment. While we're at it, also hide the existing comment when !BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/gcr/Config.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed0..afbec1a317 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_GCR depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit + depends on !BR2_PACKAGE_GNUPG # gnupg2 select BR2_PACKAGE_GNUPG2 # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 @@ -15,6 +16,15 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS + +comment "gcr is incompatible with gnupg, gnupg2 only" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + depends on !BR2_STATIC_LIBS + depends on BR2_PACKAGE_GNUPG # gnupg2