diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 22:51:50 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:28:40 +0200 |
| commit | 00bb3db576cfae3b3352ccde14c193ccb96c292e (patch) | |
| tree | e5d5cb2172c2b52ee3da52c2c8d5b5f666d63abe | |
| parent | 3d657ab3c7dbcdb16cd826099309cb69120da338 (diff) | |
| download | buildroot-00bb3db576cfae3b3352ccde14c193ccb96c292e.tar.gz buildroot-00bb3db576cfae3b3352ccde14c193ccb96c292e.zip | |
libglib2: 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
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
| -rw-r--r-- | package/libglib2/Config.in | 1 | ||||
| -rw-r--r-- | package/libglib2/libglib2.mk | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index 62e29efef2..ea946ba05e 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS 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_LIBFFI select BR2_PACKAGE_PCRE diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 577dcecdc1..eeceeee864 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -101,8 +101,8 @@ HOST_LIBGLIB2_CONF_OPTS = \ --with-pcre=system LIBGLIB2_DEPENDENCIES = \ - host-pkgconf host-libglib2 host-gettext \ - libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) + host-pkgconf host-libglib2 \ + libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext \ |
