From ab76d34ad7f854ef542b4e92fd86a5bfd32ab0e4 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 28 May 2018 12:03:32 +0100
Subject: [PATCH] build: Alphabetically order lists of functions and headers to
 find

This might make a repeat of
https://gitlab.gnome.org/GNOME/glib/issues/559 a little harder in
future.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 meson.build | 160 ++++++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/meson.build b/meson.build
index f05833b9b..d25dff3f2 100644
--- a/meson.build
+++ b/meson.build
@@ -208,53 +208,53 @@ add_project_arguments(glib_debug_cflags, language: 'c')
 # check for header files
 
 headers = [
+  'alloca.h',
+  'crt_externs.h',
+  'dirent.h', # MSC does not come with this by default
+  'float.h',
+  'fstab.h',
+  'grp.h',
+  'inttypes.h',
+  'limits.h',
+  'linux/magic.h',
+  'locale.h',
+  'mach/mach_time.h',
+  'malloc.h',
+  'memory.h',
+  'mntent.h',
+  'poll.h',
+  'pwd.h',
+  'sched.h',
+  'stdint.h',
   'stdlib.h',
   'string.h',
   'strings.h',
-  'memory.h',
-  'alloca.h',
-  'locale.h',
-  'xlocale.h',
-  'float.h',
-  'limits.h',
-  'pwd.h',
-  'grp.h',
-  'poll.h',
+  'sys/event.h',
+  'sys/filio.h',
+  'sys/inotify.h',
+  'sys/mkdev.h',
+  'sys/mntctl.h',
+  'sys/mnttab.h',
+  'sys/mount.h',
   'sys/param.h',
   'sys/resource.h',
-  'mach/mach_time.h',
   'sys/select.h',
-  'stdint.h',
-  'inttypes.h',
-  'sched.h',
-  'malloc.h',
-  'sys/vfs.h',
-  'sys/vmount.h',
   'sys/statfs.h',
+  'sys/stat.h',
   'sys/statvfs.h',
-  'sys/filio.h',
-  'mntent.h',
-  'sys/mnttab.h',
-  'sys/vfstab.h',
-  'sys/mntctl.h',
-  'fstab.h',
-  'linux/magic.h',
-  'termios.h',
-  'dirent.h', # MSC does not come with this by default
+  'sys/sysctl.h',
   'sys/time.h', # MSC does not come with this by default
   'sys/times.h',
-  'sys/wait.h',
-  'unistd.h',
-  'values.h',
   'sys/types.h',
   'sys/uio.h',
-  'sys/mkdev.h',
-  'sys/mount.h',
-  'sys/sysctl.h',
-  'crt_externs.h',
-  'sys/inotify.h',
-  'sys/event.h',
-  'sys/stat.h',
+  'sys/vfs.h',
+  'sys/vfstab.h',
+  'sys/vmount.h',
+  'sys/wait.h',
+  'termios.h',
+  'unistd.h',
+  'values.h',
+  'xlocale.h',
 ]
 
 foreach h : headers
@@ -370,60 +370,60 @@ endif
 
 functions = [
   'alloca',
-  'mmap',
-  'memalign',
-  'valloc',
-  'fsync',
-  'pipe2',
-  'issetugid',
-  'timegm',
-  'strerror_r',
-  'lstat',
-  'strsignal',
-  'vsnprintf',
-  'poll',
-  'vasprintf',
-  'setenv',
-  'unsetenv',
-  'getc_unlocked',
-  'readlink',
-  'symlink',
-  'fdwalk',
-  'lchmod',
-  'lchown',
+  'endmntent',
+  'endservent',
+  'fallocate',
   'fchmod',
   'fchown',
-  'utimes',
-  'getresuid',
-  'getmntent_r',
-  'setmntent',
-  'endmntent',
-  'hasmntopt',
+  'fdwalk',
+  'fsync',
+  'getc_unlocked',
   'getfsstat',
-  'getvfsstat',
-  'fallocate',
-  'localtime_r',
-  'gmtime_r',
-  'getpwuid_r',
   'getgrgid_r',
-  'prlimit',
-  'strnlen',
-  'wcslen',
-  'wcsnlen',
+  'getmntent_r',
+  'getpwuid_r',
+  'getresuid',
+  'getvfsstat',
+  'gmtime_r',
+  'hasmntopt',
+  'inotify_init1',
+  'issetugid',
+  'kevent',
+  'kqueue',
+  'lchmod',
+  'lchown',
+  'link',
+  'localtime_r',
+  'lstat',
   'mbrtowc',
-  'wcrtomb',
+  'memalign',
+  'mmap',
   'newlocale',
-  'uselocale',
+  'pipe2',
+  'poll',
+  'prlimit',
+  'readlink',
+  'recvmmsg',
+  'sendmmsg',
+  'setenv',
+  'setmntent',
+  'strerror_r',
+  'strnlen',
+  'strsignal',
   'strtod_l',
   'strtoll_l',
   'strtoull_l',
-  'inotify_init1',
-  'kqueue',
-  'kevent',
-  'endservent',
-  'sendmmsg',
-  'recvmmsg',
-  'link',
+  'symlink',
+  'timegm',
+  'unsetenv',
+  'uselocale',
+  'utimes',
+  'valloc',
+  'vasprintf',
+  'vsnprintf',
+  'wcrtomb',
+  'wcslen',
+  'wcsnlen',
 ]
 
 if glib_conf.has('HAVE_SYS_STATVFS_H')