From d87b0813b2555dfc855daac54074f0638a2b22b6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Dec 2021 23:10:35 +0100 Subject: [PATCH] package/libvirt: fix dependencies in Config.in Drop spurious "depends on WCHAR" added with commit ccfc90e1010e42e6529afae3a5ea8bf7226dabc1 and adds missing wchar comment While at it, drop BR2_USE_MMU from comment as it is already added by BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS and fix indentation before (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 250e96580391e130951152ae1bf9abc485d637bb) Signed-off-by: Peter Korsgaard --- package/libvirt/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index 5693ecb4cc..e75f1cf15f 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -5,12 +5,12 @@ config BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_USE_MMU # fork() -comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, kernel headers >= 3.12 (4.11 for AArch64)" +comment "libvirt needs udev /dev management, a toolchain w/ threads, dynamic library, wchar, kernel headers >= 3.12 (4.11 for AArch64)" depends on BR2_PACKAGE_LIBVIRT_ARCH_SUPPORTS - depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || !BR2_USE_MMU || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 && \ - (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) + (BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64)) config BR2_PACKAGE_LIBVIRT bool "libvirt" @@ -19,7 +19,6 @@ config BR2_PACKAGE_LIBVIRT depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 || !BR2_aarch64 depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR select BR2_PACKAGE_GNUTLS