diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 23:20:33 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:35:41 +0200 |
| commit | 5ba9a7a6529f22866f5777fc46e1fefb3638aafc (patch) | |
| tree | efef6ec52b9a08863a5b5c6f5d41f762de479ccf /package/ushare | |
| parent | b3dd9a4b887fe7394dda7a09b49a6e2234d50b97 (diff) | |
| download | buildroot-5ba9a7a6529f22866f5777fc46e1fefb3638aafc.tar.gz buildroot-5ba9a7a6529f22866f5777fc46e1fefb3638aafc.zip | |
ushare: 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
- using BR2_SYSTEM_ENABLE_NLS instead of BR2_ENABLE_LOCALE to decide
if NLS support should be enabled or not
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/ushare')
| -rw-r--r-- | package/ushare/Config.in | 1 | ||||
| -rw-r--r-- | package/ushare/ushare.mk | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/package/ushare/Config.in b/package/ushare/Config.in index 70bf24a50d..c3475b8465 100644 --- a/package/ushare/Config.in +++ b/package/ushare/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_USHARE # linking. depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBUPNP - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server component that provides UPnP media devices diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk index 32aa445126..bb194f6374 100644 --- a/package/ushare/ushare.mk +++ b/package/ushare/ushare.mk @@ -7,9 +7,10 @@ USHARE_VERSION = 1.1a USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 USHARE_SITE = http://ushare.geexbox.org/releases -USHARE_DEPENDENCIES = host-pkgconf libupnp +USHARE_DEPENDENCIES = host-pkgconf libupnp $(TARGET_NLS_DEPENDENCIES) USHARE_LICENSE = GPL-2.0+ USHARE_LICENSE_FILES = COPYING +USHARE_LDFLAGS = $(TARGET_NLS_LIBS) USHARE_CONF_OPTS = \ --prefix=/usr \ @@ -18,12 +19,7 @@ USHARE_CONF_OPTS = \ --sysconfdir=/etc \ --disable-strip -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -USHARE_DEPENDENCIES += gettext -USHARE_LDFLAGS += -lintl -endif - -ifeq ($(BR2_ENABLE_LOCALE),) +ifeq ($(BR2_SYSTEM_ENABLE_NLS),) USHARE_CONF_OPTS += --disable-nls endif |
