NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:51:50 +02:00
parent 3d657ab3c7
commit 00bb3db576
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/libglib2/Config.in
View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGLIB2
depends on BR2_USE_WCHAR # gettext depends on BR2_USE_WCHAR # gettext
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE

4
package/libglib2/libglib2.mk
View File

@ -101,8 +101,8 @@ HOST_LIBGLIB2_CONF_OPTS = \
--with-pcre=system --with-pcre=system
LIBGLIB2_DEPENDENCIES = \ LIBGLIB2_DEPENDENCIES = \
host-pkgconf host-libglib2 host-gettext \ host-pkgconf host-libglib2 \
libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES)
HOST_LIBGLIB2_DEPENDENCIES = \ HOST_LIBGLIB2_DEPENDENCIES = \
host-gettext \ host-gettext \