diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in index ac8b4aecdb..da789439b6 100644 --- a/package/dvblast/Config.in +++ b/package/dvblast/Config.in @@ -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 diff --git a/package/dvblast/dvblast.mk b/package/dvblast/dvblast.mk index 11a2dc846e..ef9a6669e3 100644 --- a/package/dvblast/dvblast.mk +++ b/package/dvblast/dvblast.mk @@ -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))