Commit 6abd7864 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent ec394d64

package/dvb-apps/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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.

package/dvb-apps/dvb-apps.mk

+9 −1
Original line number Diff line number Diff line
@@ -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