[Buildroot] [PATCH 3/3] package/mpd: add missing optional dependency

[Andreas Ziegler]

Config.in selects libiconv in certain situations (uClibc with locales
not enabled). This may lead to a build error with utils/test-pkg -p mpd.

Add missing optional dependency and restore sorting order.

Signed-off-by: Andreas Ziegler <br025 at umbiko.net>
---
 package/mpd/mpd.mk | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index c8107be128..ce7c44a9a8 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -26,14 +26,6 @@ MPD_CONF_OPTS = \
 	-Dpipewire=disabled \
 	-Dsnapcast=false
 
-# Zeroconf support depends on libdns_sd from avahi.
-ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y)
-MPD_DEPENDENCIES += avahi
-MPD_CONF_OPTS += -Dzeroconf=avahi
-else
-MPD_CONF_OPTS += -Dzeroconf=disabled
-endif
-
 ifeq ($(BR2_PACKAGE_EXPAT),y)
 MPD_DEPENDENCIES += expat
 MPD_CONF_OPTS += -Dexpat=enabled
@@ -49,6 +41,14 @@ else
 MPD_CONF_OPTS += -Dicu=disabled
 endif
 
+# uClibc w/o locales
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+MPD_DEPENDENCIES += libiconv
+MPD_CONF_OPTS += -Diconv=enabled
+else
+MPD_CONF_OPTS += -Diconv=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_JSON_FOR_MODERN_CPP),y)
 MPD_DEPENDENCIES += json-for-modern-cpp
 MPD_CONF_OPTS += -Dnlohmann_json=enabled
@@ -63,6 +63,14 @@ else
 MPD_CONF_OPTS += -Dalsa=disabled
 endif
 
+# Zeroconf support depends on libdns_sd from avahi.
+ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y)
+MPD_DEPENDENCIES += avahi
+MPD_CONF_OPTS += -Dzeroconf=avahi
+else
+MPD_CONF_OPTS += -Dzeroconf=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_AO),y)
 MPD_DEPENDENCIES += libao
 MPD_CONF_OPTS += -Dao=enabled
-- 
2.53.0