|
 |
fe2bf2 |
From a91266ef087532e2332c75c4fd9244df66f30b64 Mon Sep 17 00:00:00 2001
|
|
|
fe2bf2 |
From: Daiki Ueno <ueno@gnu.org>
|
|
|
fe2bf2 |
Date: Fri, 18 Dec 2020 13:37:10 +0100
|
|
|
fe2bf2 |
Subject: [PATCH] meson: Link trust/client modules explicitly to -ldl
|
|
|
fe2bf2 |
|
|
|
fe2bf2 |
This adds the -ldl link flag missing in the meson build, but present
|
|
|
fe2bf2 |
in the autotools build. Although the use-case is unlikely, this
|
|
|
fe2bf2 |
allows those modules to be linked as a normal shared library to a
|
|
|
fe2bf2 |
program.
|
|
|
fe2bf2 |
---
|
|
|
fe2bf2 |
p11-kit/meson.build | 1 +
|
|
|
fe2bf2 |
trust/meson.build | 2 +-
|
|
|
fe2bf2 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
fe2bf2 |
|
|
|
fe2bf2 |
diff --git a/p11-kit/meson.build b/p11-kit/meson.build
|
|
|
fe2bf2 |
index 7d57cd7..02147a9 100644
|
|
|
fe2bf2 |
--- a/p11-kit/meson.build
|
|
|
fe2bf2 |
+++ b/p11-kit/meson.build
|
|
|
fe2bf2 |
@@ -92,6 +92,7 @@ if host_system != 'windows'
|
|
|
fe2bf2 |
'client.c', 'client-init.c',
|
|
|
fe2bf2 |
name_prefix: '',
|
|
|
fe2bf2 |
include_directories: [configinc, commoninc],
|
|
|
fe2bf2 |
+ dependencies: dlopen_deps,
|
|
|
fe2bf2 |
link_args: p11_module_ldflags,
|
|
|
fe2bf2 |
link_depends: [p11_module_symbol_map,
|
|
|
fe2bf2 |
p11_module_symbol_def],
|
|
|
fe2bf2 |
diff --git a/trust/meson.build b/trust/meson.build
|
|
|
fe2bf2 |
index 482a3c1..d4a8e15 100644
|
|
|
fe2bf2 |
--- a/trust/meson.build
|
|
|
fe2bf2 |
+++ b/trust/meson.build
|
|
|
fe2bf2 |
@@ -56,7 +56,7 @@ shared_module('p11-kit-trust',
|
|
|
fe2bf2 |
'module-init.c',
|
|
|
fe2bf2 |
name_prefix: '',
|
|
|
fe2bf2 |
c_args: p11_kit_trust_c_args,
|
|
|
fe2bf2 |
- dependencies: [asn_h_dep, libp11_library_dep] + libtasn1_deps,
|
|
|
fe2bf2 |
+ dependencies: [asn_h_dep, libp11_library_dep] + dlopen_deps + libtasn1_deps,
|
|
|
fe2bf2 |
link_args: p11_module_ldflags,
|
|
|
fe2bf2 |
link_depends: [p11_module_symbol_map,
|
|
|
fe2bf2 |
p11_module_symbol_def],
|
|
|
fe2bf2 |
--
|
|
|
fe2bf2 |
2.29.2
|
|
|
fe2bf2 |
|