luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'main'

Browse Source 
link with -latomic when needed

See merge request GNOME/glib!4034
This commit is contained in:
Philip Withnall 2024-05-03 20:02:48 +00:00
commit 928b66898c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glib/meson.build
View File

@ -419,6 +419,7 @@ libglib = library('glib-2.0',
include_directories : configinc, include_directories : configinc,
link_with: [charset_lib, gnulib_lib], link_with: [charset_lib, gnulib_lib],
dependencies : [ dependencies : [
atomic_dep,
gnulib_libm_dependency, gnulib_libm_dependency,
libiconv, libiconv,
libintl_deps, libintl_deps,

9
meson.build
View File

@ -2233,6 +2233,15 @@ libffi_dep = dependency('libffi', version : '>= 3.0.0')
libz_dep = dependency('zlib') libz_dep = dependency('zlib')
libatomic_test_code = '''
int main (int argc, char ** argv) {
return 0;
}'''
atomic_dep = []
if cc.links(libatomic_test_code, args : '-latomic', name : 'check for -latomic')
atomic_dep = cc.find_library('atomic')
endif
# First check in libc, fallback to libintl, and as last chance build # First check in libc, fallback to libintl, and as last chance build
# proxy-libintl subproject. # proxy-libintl subproject.
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible