From 6abd7864fbcdaeb82074f46b23ad6d7fc7321852 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 12 Jan 2013 02:53:35 +0000 Subject: 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" Signed-off-by: Peter Korsgaard --- package/dvb-apps/Config.in | 1 + package/dvb-apps/dvb-apps.mk | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in index ca8dc54ef..7f763307e 100644 --- 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 f914799fd..ee4aadb51 100644 --- 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 -- cgit v1.2.3