From ff5471d6983158cb5ad51e4eab577b72b601e461 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 21 Mar 2022 08:46:32 +0100 Subject: [PATCH] Revert "package/gcr: depends on !gnupg" This reverts commit 816861524a079658040d6e059743697affdeafce. This doesn't work with the gnupg v1/v2 handling here: package/gcr/Config.in:1:error: recursive dependency detected! package/gcr/Config.in:1: symbol BR2_PACKAGE_GCR depends on BR2_PACKAGE_GNUPG package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_GNUPG2 package/gnupg2/Config.in:5: symbol BR2_PACKAGE_GNUPG2 is selected by BR2_PACKAGE_GCR For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" Signed-off-by: Peter Korsgaard --- package/gcr/Config.in | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index afbec1a317..e233fffed0 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -5,7 +5,6 @@ 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 @@ -16,15 +15,6 @@ 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