mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/mpd: add missing optional dependency
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@umbiko.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
e7e2050d54
commit
83e637d7cc
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user