84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -522,7 +522,6 @@
|
|
'-Wno-format-zero-length',
|
|
# We explicitly require variadic macros
|
|
'-Wno-variadic-macros',
|
|
- '-Werror=format=2',
|
|
'-Werror=init-self',
|
|
'-Werror=missing-include-dirs',
|
|
'-Werror=pointer-arith',
|
|
@@ -638,7 +637,6 @@
|
|
'getresuid',
|
|
'getvfsstat',
|
|
'gmtime_r',
|
|
- 'hasmntopt',
|
|
'inotify_init1',
|
|
'issetugid',
|
|
'kevent',
|
|
@@ -944,7 +942,7 @@
|
|
int main (int argc, char ** argv) {
|
|
syscall (__NR_futex, NULL, FUTEX_WAKE, FUTEX_WAIT);
|
|
return 0;
|
|
- }''', name : 'futex(2) system call')
|
|
+ }''', name : 'futex(2) system call') and host_system != 'android'
|
|
glib_conf.set('HAVE_FUTEX', 1)
|
|
endif
|
|
if cc.compiles('''#include <linux/futex.h>
|
|
@@ -953,7 +951,7 @@
|
|
int main (int argc, char ** argv) {
|
|
syscall (__NR_futex_time64, NULL, FUTEX_WAKE, FUTEX_WAIT);
|
|
return 0;
|
|
- }''', name : 'futex(2) system call')
|
|
+ }''', name : 'futex(2) system call') and host_system != 'android'
|
|
glib_conf.set('HAVE_FUTEX_TIME64', 1)
|
|
endif
|
|
|
|
@@ -977,7 +975,7 @@
|
|
syscall (SYS_pidfd_open, 0, 0);
|
|
waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG);
|
|
return 0;
|
|
- }''', name : 'pidfd_open(2) system call')
|
|
+ }''', name : 'pidfd_open(2) system call') and host_system != 'android'
|
|
glib_conf.set('HAVE_PIDFD', 1)
|
|
endif
|
|
|
|
@@ -2137,7 +2135,7 @@
|
|
libintl_deps = []
|
|
libintl_prefix = '#include <libintl.h>'
|
|
libintl = dependency('intl', required: false)
|
|
-if libintl.found() and libintl.type_name() != 'internal'
|
|
+if false
|
|
# libintl supports different threading APIs, which may not
|
|
# require additional flags, but it defaults to using pthreads if
|
|
# found. Meson's "threads" dependency does not allow you to
|
|
@@ -2164,13 +2162,10 @@
|
|
endif
|
|
endif
|
|
|
|
-if libintl.found() and libintl.type_name() != 'internal'
|
|
+if false
|
|
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps, prefix: libintl_prefix)
|
|
else
|
|
- # using proxy-libintl fallback
|
|
- libintl = dependency('intl', allow_fallback: true)
|
|
- assert(libintl.type_name() == 'internal')
|
|
- libintl_deps = [libintl]
|
|
+ libintl_deps = []
|
|
have_bind_textdomain_codeset = true # proxy-libintl supports it
|
|
endif
|
|
|
|
@@ -2551,11 +2546,7 @@
|
|
|
|
# introspection
|
|
gir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
|
|
-enable_gir = get_option('introspection').allowed() and gir_scanner.found() and meson.can_run_host_binaries()
|
|
-
|
|
-if get_option('introspection').enabled() and not meson.can_run_host_binaries()
|
|
- error('Running binaries on the build host needs to be supported to build with -Dintrospection=enabled')
|
|
-endif
|
|
+enable_gir = get_option('introspection').allowed() and gir_scanner.found()
|
|
|
|
gir_args = [
|
|
'--quiet',
|