diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2015-10-30 16:43:40 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-31 15:58:17 +0100 |
| commit | bdd72afa173ab97617f413a9ff01ac2b1dad7ba6 (patch) | |
| tree | 898acab784b5998c0bc80cfeec3eb56da5b576f3 /package/dvblast | |
| parent | 301c18e1233a4e1bbbd5368496ddfe99480909bf (diff) | |
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>
Diffstat (limited to 'package/dvblast')
| -rw-r--r-- | package/dvblast/Config.in | 1 | ||||
| -rw-r--r-- | package/dvblast/dvblast.mk | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in index ac8b4aecd..da789439b 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 11a2dc846..ef9a6669e 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)) |