From: Yann E. MORIN <yann.morin.1998@free.fr>
Date: Fri, 30 Oct 2015 15:43:40 +0000 (+0100)
Subject: package/dvblast: always needs iconv
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdd72afa173ab97617f413a9ff01ac2b1dad7ba6;p=buildroot.git

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: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Julian Scheel <julian@jusst.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

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))