Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two minor build fixes #445

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Two minor build fixes #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc20d4f
meson.build: Fix detection of libzim built with Xapian
OlCe2 Jan 13, 2025
39bfaa0
zimcheck/meson.build: Fix FreeBSD build; Avoid crushing 'thread_dep'
OlCe2 Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ endif

libzim_dep = dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage)

with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
with_xapian_support = compiler.has_header_symbol(
'zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)

find_library_in_compiler = meson.version().version_compare('>=0.31.0')
rt_dep = dependency('rt', required:false)
Expand Down
16 changes: 8 additions & 8 deletions src/zimcheck/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ endif

inc = include_directories(extra_include)

if compiler.get_id() == 'gcc' and host_machine.system() == 'linux'
# C++ std::thread is implemented using pthread on linux by gcc
thread_dep = dependency('threads')
else
thread_dep = dependency('', required:false)
zimcheck_deps = [libzim_dep, icu_dep, docopt_dep]

# C++ std::thread is implemented using pthread on Linux by GCC, and on FreeBSD
# for both GCC and LLVM.
if (host_machine.system() == 'linux' and compiler.get_id() == 'gcc') or \
host_machine.system() == 'freebsd'
zimcheck_deps += dependency('threads')
endif

executable('zimcheck',
Expand All @@ -23,7 +25,5 @@ executable('zimcheck',
'../tools.cpp',
'../metadata.cpp',
include_directories : inc,
dependencies: [libzim_dep, icu_dep, thread_dep, docopt_dep],
dependencies: zimcheck_deps,
install: true)