2019-05-11 23:27:58 +02:00
|
|
|
diff -u -r ../glib-2.60.2/meson.build ./meson.build
|
|
|
|
|
--- ../glib-2.60.2/meson.build 2019-05-03 13:43:28.000000000 +0000
|
|
|
|
|
+++ ./meson.build 2019-05-11 20:10:26.054269305 +0000
|
|
|
|
|
@@ -360,7 +360,6 @@
|
|
|
|
|
# https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions.
|
|
|
|
|
'-Wno-pedantic',
|
|
|
|
|
'-Werror=declaration-after-statement',
|
|
|
|
|
- '-Werror=format=2',
|
|
|
|
|
'-Werror=implicit-function-declaration',
|
|
|
|
|
'-Werror=init-self',
|
|
|
|
|
'-Werror=missing-include-dirs',
|
2019-06-12 04:27:15 +02:00
|
|
|
--- ./meson.build.orig 2019-06-11 00:18:20.480045589 +0000
|
|
|
|
|
+++ ./meson.build 2019-06-11 00:19:34.408583457 +0000
|
2020-09-11 18:17:02 +02:00
|
|
|
@@ -1780,9 +1780,8 @@
|
|
|
|
|
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
|
|
|
|
|
# implementations. This could be extended if issues are found in some platforms.
|
|
|
|
|
libintl_deps = []
|
2019-06-12 04:27:15 +02:00
|
|
|
-if cc.has_function('ngettext')
|
2020-09-11 18:17:02 +02:00
|
|
|
- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
|
2019-06-12 04:27:15 +02:00
|
|
|
-else
|
2020-09-11 18:17:02 +02:00
|
|
|
+have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
|
2020-09-11 18:46:57 +02:00
|
|
|
+if host_system != 'android'
|
2020-09-11 18:17:02 +02:00
|
|
|
# First just find the bare library.
|
|
|
|
|
libintl = cc.find_library('intl', required : false)
|
|
|
|
|
# The bare library probably won't link without help if it's static.
|
