smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass -latomic for architectures that need it 

Some architectures, specifically armel, mipsel, m68k & powerpc in
Debian, need to explicitly link to atomic.

Use meson to see if the target's CPU family is one of those, and if so,
pass -latomic to the linker.

Tested on armel and mipsel machines to verify passing -latomic works, and
on armhf and amd64 to ensure normal builds aren't broken.

Fixes #371.
This commit is contained in:
Kunal Mehta 2020-06-21 01:02:00 -07:00 committed by Kunal Mehta
parent c986290d83
commit fb79cde729
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -18,6 +18,11 @@ if 'java' in wrapper
add_languages('java') add_languages('java')
endif endif
# See https://github.com/kiwix/kiwix-lib/issues/371
if target_machine.cpu_family() in ['arm', 'mips', 'm68k', 'ppc']
extra_libs += '-latomic'
endif
thread_dep = dependency('threads') thread_dep = dependency('threads')
libicu_dep = dependency('icu-i18n', static:static_deps) libicu_dep = dependency('icu-i18n', static:static_deps)
libzim_dep = dependency('libzim', version : '>=6.1.1', static:static_deps) libzim_dep = dependency('libzim', version : '>=6.1.1', static:static_deps)

1
src/meson.build
View File

@ -53,6 +53,7 @@ kiwixlib = library('kiwix',
kiwix_sources, kiwix_sources,
include_directories : inc, include_directories : inc,
dependencies : all_deps, dependencies : all_deps,
link_args: extra_libs,
version: meson.project_version(), version: meson.project_version(),
install: true, install: true,
install_dir: install_dir) install_dir: install_dir)