jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ushare: use the new gettext logic

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:20:33 +02:00
parent b3dd9a4b88
commit 5ba9a7a652
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/ushare/Config.in
View File

@ -6,7 +6,6 @@ config BR2_PACKAGE_USHARE
# linking. # linking.
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBUPNP select BR2_PACKAGE_LIBUPNP
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
uShare is a UPnP (TM) A/V & DLNA Media Server. uShare is a UPnP (TM) A/V & DLNA Media Server.
It implements the server component that provides UPnP media devices It implements the server component that provides UPnP media devices

10
package/ushare/ushare.mk
View File

@ -7,9 +7,10 @@
USHARE_VERSION = 1.1a USHARE_VERSION = 1.1a
USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
USHARE_SITE = http://ushare.geexbox.org/releases 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 = GPL-2.0+
USHARE_LICENSE_FILES = COPYING USHARE_LICENSE_FILES = COPYING
USHARE_LDFLAGS = $(TARGET_NLS_LIBS)
USHARE_CONF_OPTS = \ USHARE_CONF_OPTS = \
--prefix=/usr \ --prefix=/usr \
@ -18,12 +19,7 @@ USHARE_CONF_OPTS = \
--sysconfdir=/etc \ --sysconfdir=/etc \
--disable-strip --disable-strip
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
USHARE_DEPENDENCIES += gettext
USHARE_LDFLAGS += -lintl
endif
ifeq ($(BR2_ENABLE_LOCALE),)
USHARE_CONF_OPTS += --disable-nls USHARE_CONF_OPTS += --disable-nls
endif endif