package/dvb-apps: requires iconv

Use libiconv if the toolchain does not have locales.

Fixes (for example):
    http://autobuild.buildroot.net/results/c5776c95ac128f7c7eadc2fe746ad89f8c1ef49a

[Peter: fixup LDFLAGS for BR2_ENABLE_LOCALE=y builds]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index ca8dc54ef3cd04acf706a113d4250f41bfbbb6ed..7f763307e48d5ff8c0a8889e9278a09be4d94d38 100644 (file)
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -14,6 +14,7 @@ comment "dvb-apps utils needs LARGEFILE support in the toolchain"
 config BR2_PACKAGE_DVB_APPS_UTILS
        bool "dvb-apps utilities"
        depends on BR2_LARGEFILE
+       select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
          A small number of DVB test and utility programs,
          including szap and dvbscan.

diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index f914799fd6e9d18728f0be36bb858754cb3c6349..ee4aadb51a9700f758bf73875b0d8ac7e81ff3bc 100644 (file)
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -20,10 +20,18 @@ DVB_APPS_LICENSE        = unknown (probably public domain)
 
 ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
 # Utilitiess are selected, build and install everything
+
+DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
+
+ifeq ($(BR2_ENABLE_LOCALE),)
+DVB_APPS_DEPENDENCIES    = libiconv
+DVB_APPS_LDFLAGS        += -liconv
+endif
+
 DVB_APPS_INSTALL_STAGING = YES
 
 define DVB_APPS_BUILD_CMDS
-       $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) V=1
+       $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" $(MAKE) -C $(@D) V=1
 endef
 
 define DVB_APPS_INSTALL_STAGING_CMDS