[glib: 6/6] Merge branch 'disable-ios-nsgetenviron' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit 2ed356cb67dff722e0a58906861ad70965c5b2a3
Merge: 3fd3a246f ab6b764e2
Author: Sebastian Dröge <slomo coaxion net>
Date:   Tue Jun 2 10:56:44 2020 +0000

    Merge branch 'disable-ios-nsgetenviron' into 'master'
    
    Various fixes when building for iOS
    
    See merge request GNOME/glib!1512

 .gitlab-ci/android-setup-env.sh       |  1 +
 .gitlab-ci/cross_file_ios_example.txt | 25 +++++++++++++++++++++++++
 meson.build                           | 19 +++++++++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)
---