diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-21 22:58:55 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-21 22:58:55 +0530 |
| commit | 48ef372412edfdd9c7fd34f5fdfaf8831791712f (patch) | |
| tree | cda6cba7c115b4d6ea07861e7c0bc7e1ebc41f38 | |
| parent | 57f32f87363a96150ea0f2009b7cd6ffdd14dcc0 (diff) | |
glib-tools.recipe: Use system gettext on Linux
Otherwise glib will detect the system gettext, but then fail to link
to it because libintl.so exists inside our prefix from proxy-libintl.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/610>
| -rw-r--r-- | recipes/build-tools/glib-tools.recipe | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe index 427636da..9f65ae83 100644 --- a/recipes/build-tools/glib-tools.recipe +++ b/recipes/build-tools/glib-tools.recipe @@ -11,9 +11,13 @@ class Recipe(recipe.Recipe): btype = BuildType.MESON meson_options = {'internal_pcre': 'true', 'libmount': 'false', 'dtrace': 'false', 'iconv': 'auto', 'selinux' : 'disabled'} - deps = ['proxy-libintl', 'libffi', 'zlib', 'pkg-config'] + deps = ['libffi', 'zlib', 'pkg-config'] def prepare(self): + # On Linux we must use the system gettext + if self.config.platform != Platform.LINUX: + self.deps.append('proxy-libintl') + # Android only provides libiconv with API level >=28 (Pie and newer) if self.config.target_platform == Platform.ANDROID: self.deps.append('libiconv') |