diff options
Diffstat (limited to 'devel/glib2/patches/patch-meson.build')
-rw-r--r-- | devel/glib2/patches/patch-meson.build | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build index 5da9e3913ef..07e4c711e20 100644 --- a/devel/glib2/patches/patch-meson.build +++ b/devel/glib2/patches/patch-meson.build @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.3 2019/06/03 23:09:29 maya Exp $ +$NetBSD: patch-meson.build,v 1.4 2019/06/18 13:05:14 jperkin Exp $ - Don't insist that python binary is called "python3". (Requires meson >= 0.50.0) @@ -11,7 +11,7 @@ https://gitlab.gnome.org/GNOME/glib/merge_requests/888 - auto-detect GNU iconv, even if no arguments are passed. (by checking if iconv.h might in fact be a gnu one) ---- meson.build.orig 2019-05-03 13:43:28.000000000 +0000 +--- meson.build.orig 2019-06-10 17:47:20.000000000 +0000 +++ meson.build @@ -1696,14 +1696,14 @@ else found_iconv = false @@ -36,6 +36,15 @@ https://gitlab.gnome.org/GNOME/glib/merge_requests/888 endif elif iconv_opt == 'native' if cc.has_header_symbol('iconv.h', 'iconv_open') +@@ -1785,7 +1785,7 @@ endif + # proxy-libintl subproject. + # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible + # implementations. This could be extended if issues are found in some platforms. +-if cc.has_function('ngettext') ++if cc.has_function('ngettext') and host_system != 'sunos' + libintl = [] + have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') + else @@ -1836,16 +1836,15 @@ if host_system != 'windows' and get_opti if cc.has_function('getxattr') and cc.has_header('sys/xattr.h') glib_conf.set('HAVE_SYS_XATTR_H', 1) |