jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-25 20:26:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: use 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

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:42:08 +02:00
parent 9494e46a07
commit 388bb94b3d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/dnsmasq/Config.in
View File

@ -31,7 +31,6 @@ config BR2_PACKAGE_DNSMASQ_IDN
bool "IDN support" bool "IDN support"
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBIDN select BR2_PACKAGE_LIBIDN
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help help
Enable IDN support in dnsmasq. Enable IDN support in dnsmasq.
This option is a big space taker since it pulls in many This option is a big space taker since it pulls in many

4
package/dnsmasq/dnsmasq.mk
View File

@ -32,8 +32,8 @@ endif
# NLS requires IDN so only enable it (i18n) when IDN is true # NLS requires IDN so only enable it (i18n) when IDN is true
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES)
DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS)
DNSMASQ_COPTS += -DHAVE_IDN DNSMASQ_COPTS += -DHAVE_IDN
DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
endif endif