summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-05-29 02:01:11 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2020-05-29 02:16:42 +0530
commitcaeec6d0f49ab475f4d3793638cf982096b609fa (patch)
treee05aca3832e3f5fe77e15492c3be820cc8400f5e
parent778f92a7746674592b444a1b447ba89c239184b1 (diff)
config: Remove glib-specific autoconf hacks
These haven't been used ever since glib was ported to Meson: glib_cv_stack_grows is now set as a cross property glib_cv_uscore is correctly detected with meson getpwuid_r is correctly detected with meson getgrgid_r is correctly detected with meson wchar_t is available and things work fine (added in 2013, no notes) _NSGetEnviron is fixed in the previous commit Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/489>
-rw-r--r--config/android.config7
-rw-r--r--config/ios.config7
2 files changed, 2 insertions, 12 deletions
diff --git a/config/android.config b/config/android.config
index 4d00889d..ddcc1f19 100644
--- a/config/android.config
+++ b/config/android.config
@@ -209,12 +209,7 @@ elif target_arch == Architecture.X86_64:
extra_lib_path = '%s/usr/lib64' % (sysroot)
# For GLib
-env['glib_cv_stack_grows'] = 'yes'
-env['glib_cv_uscore'] = 'no'
-env['ac_cv_func_posix_getpwuid_r'] = 'no'
-env['ac_cv_func_nonposix_getpwuid_r'] = 'no'
-env['ac_cv_func_posix_getgrgid_r'] = 'no'
-env['ac_cv_func_nonposix_getgrgid_r'] = 'no'
+meson_properties['growing_stack'] = 'true'
# For cairo
# FIXME : IF WE ADD BIG-ENDIAN PLATFORMS, FIX THIS !
diff --git a/config/ios.config b/config/ios.config
index 4f4bb0dc..cddbdcf1 100644
--- a/config/ios.config
+++ b/config/ios.config
@@ -146,12 +146,7 @@ if use_ccache:
env['CXX'] = 'ccache %s' % env['CXX']
# For GLib
-env['glib_cv_stack_grows'] = 'yes'
-env['glib_cv_uscore'] = 'no'
-env['ac_cv_func_posix_getpwuid_r'] = 'yes'
-env['ac_cv_func_posix_getgrgid_r'] = 'yes'
-env['gt_cv_c_wchar_t'] = 'no'
-env['ac_cv_func__NSGetEnviron'] = 'no'
+meson_properties['growing_stack'] = 'true'
# For pixman
env['ac_cv_tls'] = 'none'