diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:22:43 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:36:01 +0200 |
| commit | feaf0570d887b3f5579dbb357764a138d362ff43 (patch) | |
| tree | c523bc5f76229a7aaef6f4ed33843f270d1b5a09 | |
| parent | 7426b582f6aedef449f398b1f815fb22978687ef (diff) | |
| download | buildroot-feaf0570d887b3f5579dbb357764a138d362ff43.tar.gz buildroot-feaf0570d887b3f5579dbb357764a138d362ff43.zip | |
vdr: use the new gettext logic
This commit switches to use the new gettext logic, which involves:
- using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
on gettext/host-gettext
- using TARGET_NLS_LIBS to force linking against libintl
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/vdr/Config.in | 1 | ||||
| -rw-r--r-- | package/vdr/vdr.mk | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/package/vdr/Config.in b/package/vdr/Config.in index d32c642710..65117f5461 100644 --- a/package/vdr/Config.in +++ b/package/vdr/Config.in @@ -7,7 +7,6 @@ config BR2_PACKAGE_VDR depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_JPEG diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index 6c4656624e..242c5798d1 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -14,7 +14,8 @@ VDR_DEPENDENCIES = \ freetype \ fontconfig \ jpeg \ - libcap + libcap \ + $(TARGET_NLS_DEPENDENCIES) VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 VDR_MAKE_FLAGS = \ @@ -22,11 +23,7 @@ VDR_MAKE_FLAGS = \ PLUGINLIBDIR=/usr/lib/vdr \ PREFIX=/usr \ VIDEODIR=/var/lib/vdr - -ifeq ($(BR2_NEEDS_GETTEXT),y) -VDR_DEPENDENCIES += gettext -VDR_LDFLAGS += -lintl -endif +VDR_LDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) VDR_DEPENDENCIES += libfribidi |
