1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
| | From de5a3522cc7dd28d9b12f26ad29803ae623dcf24 Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Thu, 5 Jan 2023 22:56:35 +0100
Subject: [PATCH] Make sure that libp11-kit does not have undefined symbols
Under mingw, as a DLL, libp11-kit is not allowed to have undefined
symbols. It means that it should also add the COMMON_LIBS in addition
to the internal library.
The programs must do that too, otherwise they have undefined symbols.
---
p11-kit/Makefile.am | 13 ++++++++++---
trust/Makefile.am | 3 ++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am
index 7fe7a6c..11ec3da 100644
--- a/p11-kit/Makefile.am
+++ b/p11-kit/Makefile.am
@@ -237,6 +237,8 @@ EXTRA_DIST += \
bin_PROGRAMS += p11-kit/p11-kit
+p11_kit_p11_kit_CFLAGS = $(COMMON_CFLAGS)
+
p11_kit_p11_kit_SOURCES = \
p11-kit/lists.c \
p11-kit/p11-kit.c \
@@ -244,8 +246,9 @@ p11_kit_p11_kit_SOURCES = \
p11_kit_p11_kit_LDADD = \
libp11-kit.la \
+ libp11-kit-internal.la \
libp11-tool.la \
- libp11-common.la \
+ $(COMMON_LIBS) \
$(LTLIBINTL) \
$(NULL)
@@ -257,12 +260,14 @@ private_PROGRAMS += p11-kit/p11-kit-remote
p11_kit_p11_kit_remote_SOURCES = \
p11-kit/remote.c \
+ $(libp11_kit_la_SOURCES) \
$(NULL)
p11_kit_p11_kit_remote_LDADD = \
libp11-tool.la \
- libp11-common.la \
libp11-kit.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(NULL)
check_PROGRAMS += p11-kit/p11-kit-remote-testable
@@ -278,12 +283,14 @@ private_PROGRAMS += p11-kit/p11-kit-server
p11_kit_p11_kit_server_SOURCES = \
p11-kit/server.c \
+ $(libp11_kit_la_SOURCES) \
$(NULL)
p11_kit_p11_kit_server_LDADD = \
libp11-tool.la \
- libp11-common.la \
libp11-kit.la \
+ libp11-kit-internal.la \
+ $(COMMON_LIBS) \
$(LIBSYSTEMD_LIBS) \
$(NULL)
diff --git a/trust/Makefile.am b/trust/Makefile.am
index 6ff5d12..4e99a80 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -85,11 +85,12 @@ bin_PROGRAMS += trust/trust
trust_trust_LDADD = \
libtrust-data.la \
libp11-kit.la \
- libp11-common.la \
+ libp11-kit-internal.la \
libp11-tool.la \
$(LTLIBINTL) \
$(LIBTASN1_LIBS) \
$(HASH_LIBS) \
+ $(COMMON_LIBS) \
$(NULL)
trust_trust_CFLAGS = \
--
2.38.1
|