Created
May 31, 2023 04:34
-
-
Save rkitover/9f3cceac7eaa9625ce605f052c56f3ba to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- glib-original/meson.build 2023-05-31 01:05:34 | |
+++ glib/meson.build 2023-05-31 04:32:57 | |
@@ -2103,6 +2103,8 @@ | |
libintl_deps = [] | |
libintl_prefix = '#include <libintl.h>' | |
libintl = dependency('intl', required: false, allow_fallback: false) | |
+libiconv = dependency('iconv', required: false) | |
+mac_cf = dependency('appleframeworks', modules: ['CoreFoundation'], required: false) | |
if libintl.found() | |
# libintl supports different threading APIs, which may not | |
# require additional flags, but it defaults to using pthreads if | |
@@ -2113,12 +2115,12 @@ | |
# | |
# Meson's builtin dependency lookup as of 0.60.0 doesn't check for | |
# pthread, so we do this manually here. | |
- if cc.has_function('ngettext', dependencies : libintl, prefix: libintl_prefix) | |
- libintl_deps += [libintl] | |
+ if cc.has_function('ngettext', dependencies : [libintl, libiconv, mac_cf], prefix: libintl_prefix) | |
+ libintl_deps += [libintl, libiconv, mac_cf] | |
else | |
libintl_pthread = cc.find_library('pthread', required : false) | |
- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread], prefix: libintl_prefix) | |
- libintl_deps += [libintl, libintl_pthread] | |
+ if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread, libiconv, mac_cf], prefix: libintl_prefix) | |
+ libintl_deps += [libintl, libintl_pthread, libiconv, mac_cf] | |
else | |
libintl = disabler() | |
endif |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment