Commit bdd72afa authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

package/dvblast: always needs iconv 

dvblast wants iconv functions even without locales.

Fixes:
    http://autobuild.buildroot.org/results/03f/03fe6dc17d7f36d9b8c7ced402850def95d8feb3/
    http://autobuild.buildroot.org/results/064/0647b0180ac9a6bf6172742e388df9a9e584d91b/


    ...

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julian Scheel <julian@jusst.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 301c18e1

package/dvblast/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config BR2_PACKAGE_DVBLAST 
	bool "dvblast"

	select BR2_PACKAGE_BITSTREAM

	select BR2_PACKAGE_LIBEV

	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE

	depends on !BR2_bfin  # libev

	help

	  DVBlast is a simple and powerful MPEG-2/TS demux and

package/dvblast/dvblast.mk

+9 −2
Original line number Diff line number Diff line
@@ -11,12 +11,19 @@ DVBLAST_LICENSE = GPLv2+, WTFPL 
DVBLAST_LICENSE_FILES = COPYING COPYING.WTFPL

DVBLAST_DEPENDENCIES = bitstream libev



DVBLAST_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS)



ifeq ($(BR2_PACKAGE_LIBICONV),y)

DVBLAST_DEPENDENCIES += libiconv

DVBLAST_MAKE_ENV += LDLIBS=-liconv

endif



define DVBLAST_BUILD_CMDS

	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)

	$(DVBLAST_MAKE_ENV) $(MAKE) -C $(@D)

endef



define DVBLAST_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install

	$(DVBLAST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install

endef



$(eval $(generic-package))