kodi, mpd: fix samba4 related dependency mistakes

This commit fixes the following kconfig warning:

   warning: (BR2_PACKAGE_KODI_LIBSMBCLIENT && BR2_PACKAGE_MPD_LIBSMBCLIENT) selects BR2_PACKAGE_SAMBA4 which has unmet direct dependencies (!BR2_PACKAGE_SAMBA && BR2_USE_MMU && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_NATIVE_RPC && BR2_TOOLCHAIN_HAS_THREADS && !BR2_STATIC_LIBS && !BR2_nios2)

by updating the kodi and mpd Config.in files to properly take into
account the dependencies of the BR2_PACKAGE_SAMBA4 option that they
select.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index e697b52d272ff3e612d5e9eac21b484f365005e3..a657f5baf13374ef6fe9abd44ab5933b4501ddb3 100644 (file)
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -208,12 +208,13 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 comment "shairport support needs a toolchain w/ dynamic library"
        depends on BR2_STATIC_LIBS
 
-comment "samba support needs an (e)glibc toolchain"
-       depends on !BR2_TOOLCHAIN_USES_GLIBC
+comment "samba support needs an (e)glibc toolchain w/ RPC"
+       depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 
 config BR2_PACKAGE_KODI_LIBSMBCLIENT
        bool "samba"
        depends on BR2_TOOLCHAIN_USES_GLIBC
+       depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_PACKAGE_SAMBA4
        help
          Enable Samba support

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index be0843fb1012a9540efc02daafc3449d0a7872a9..db79b0859da4c31265b5176358ea8d34b0f5a03d 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -189,13 +189,17 @@ config BR2_PACKAGE_MPD_LIBNFS
 comment "nfs support needs a toolchain w/ threads support"
        depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
 
-comment "samba support needs an (e)glibc toolchain"
-       depends on !BR2_TOOLCHAIN_USES_GLIBC
+comment "samba support needs an (e)glibc toolchain w/ dynamic library, RPC"
+       depends on !BR2_nios2
+       depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
+               !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 
 config BR2_PACKAGE_MPD_LIBSMBCLIENT
        bool "samba"
        depends on !BR2_nios2 # samba
        depends on BR2_TOOLCHAIN_USES_GLIBC
+       depends on !BR2_STATIC_LIBS
+       depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_PACKAGE_SAMBA4
        help
          Enable Samba support.