Revert "package/gcr: depends on !gnupg"

This reverts commit 5c05744eca.

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 <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2022-03-21 08:44:40 +01:00
parent 1602ff3004
commit b4b78a0f8a

View File

@ -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