aboutsummaryrefslogtreecommitdiffstats
path: root/main/glib/musl-libintl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/glib/musl-libintl.patch')
-rw-r--r--main/glib/musl-libintl.patch19
1 files changed, 6 insertions, 13 deletions
diff --git a/main/glib/musl-libintl.patch b/main/glib/musl-libintl.patch
index d54bd3fa43..21646a20b2 100644
--- a/main/glib/musl-libintl.patch
+++ b/main/glib/musl-libintl.patch
@@ -2,27 +2,20 @@ diff --git a/meson.build b/meson.build
index 8320449..1d05edd 100644
--- a/meson.build
+++ b/meson.build
-@@ -1785,10 +1785,10 @@ endif
- # proxy-libintl subproject.
+@@ -2003,9 +2003,6 @@
# 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 = []
-if cc.has_function('ngettext')
-- libintl = []
- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-else
-+#if cc.has_function('ngettext')
-+# libintl = []
-+# have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-+#else
+ # First just find the bare library.
libintl = cc.find_library('intl', required : false)
- if not libintl.found()
- libintl = subproject('proxy-libintl').get_variable('intl_dep')
-@@ -1797,7 +1797,7 @@ else
+ # The bare library probably won't link without help if it's static.
+@@ -2037,7 +2034,6 @@
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset',
- dependencies : libintl)
+ dependencies : libintl_deps)
endif
-endif
-+#endif
glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)
-