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

Jump to bottom

meson.build: fix static build with gcrypt #185

Closed
wants to merge 1 commit into from
Closed

meson.build: fix static build with gcrypt #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ elif crypto == 'none'
description : 'If set RFC6744 random does not use any CRYPTO lib.')
endif

# gpg-error is a dependency of gcrypt
gpg_error_dep = dependency('gpg-error', required : false)

systemd = dependency('systemd', required : false)
systemdunitdir = get_option('systemdunitdir')
if systemdunitdir == '' and systemd.found()
Expand Down Expand Up @@ -241,7 +244,7 @@ libcommon = static_library(

if build_ping == true
executable('ping', ['ping.c', 'ping_common.c', 'ping6_common.c', git_version_h],
dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, resolv_dep],
dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, gpg_error_dep, resolv_dep],
link_with : [libcommon],
install: true)
meson.add_install_script('build-aux/setcap-setuid.sh',
Expand Down
2 changes: 1 addition & 1 deletion ninfod/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ninfod_sources = files('''
ninfod_name.c
'''.split())
executable('ninfod', [ninfod_sources, git_version_h],
dependencies : [cap_dep, crypto_dep, rt_dep, threads],
dependencies : [cap_dep, crypto_dep, gpg_error_dep, rt_dep, threads],
link_with : [libcommon],
include_directories : inc,
install: true,
Expand Down