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

php: 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

 - dropping BR2_PACKAGE_GETTEXT selection. Thanks to this, we can drop
   the BR2_USE_WCHAR dependency

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2017-07-03 23:13:28 +02:00
parent bdef565cd6
commit 0747f21e12
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/php/Config.ext
View File

@ -164,13 +164,12 @@ comment "Human language and character encoding support"
config BR2_PACKAGE_PHP_EXT_GETTEXT config BR2_PACKAGE_PHP_EXT_GETTEXT
bool "Gettext" bool "Gettext"
depends on BR2_USE_WCHAR depends on BR2_SYSTEM_ENABLE_NLS
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
help help
Gettext support Gettext support
comment "Gettext support needs a toolchain w/ wchar" comment "Gettext support needs NLS enabled"
depends on !BR2_USE_WCHAR depends on !BR2_SYSTEM_ENABLE_NLS
config BR2_PACKAGE_PHP_EXT_ICONV config BR2_PACKAGE_PHP_EXT_ICONV
bool "iconv" bool "iconv"

2
package/php/php.mk
View File

@ -160,7 +160,7 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext) PHP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
endif endif
ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y) ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y)