diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-10-28 03:03:18 +1100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-11-12 04:13:14 +0000 |
| commit | aba64c286b774013fef951c36da1bcc5722ea32e (patch) | |
| tree | 184c72c616a5d23e86189367b45503e785bfe635 /recipes/glib.recipe | |
| parent | 6934538b28e3b5edb024afa953b70e5e1b0745fe (diff) | |
glib: remove uneeded _FILE_OFFSET_BITS hack with android NDK r18
Diffstat (limited to 'recipes/glib.recipe')
| -rw-r--r-- | recipes/glib.recipe | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index aa9b6c3e..ebb22591 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -137,15 +137,7 @@ class Recipe(recipe.Recipe): self.deps.append('libiconv') self.meson_options.update({'iconv': 'gnu'}) - if self.config.target_platform == Platform.ANDROID: - v = DistroVersion.get_android_api_version(self.config.target_distro_version) - if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7, Architecture.X86] and v < 21: - # FIXME: HACK to make projects using mmap compile with NDK 16 - # we fail to compile with -D_FILE_OFFSET_BITS=64 - # because we don't use clang and we use a platform < 21 (Lollipop) - # See $NDK_ROOT/sysroot/usr/include/sys/mman.h as one example - self.append_env('CFLAGS', '-U_FILE_OFFSET_BITS') - elif self.config.target_platform == Platform.WINDOWS: + if self.config.target_platform == Platform.WINDOWS: # Want secure versions of stdlib functions. Glib already defines # _WIN32_WINNT, so undefine it on the cmdline to avoid warnings self.append_env('CFLAGS', '-DMINGW_HAS_SECURE_API=1', '-U_WIN32_WINNT') |