forked from QubesOS/qubes-vmm-xen
-
Notifications
You must be signed in to change notification settings - Fork 0
/
patch-c9bd8a73-tools-xenstore-add-libdl-dependency-to-libxenstore.patch
53 lines (46 loc) · 1.76 KB
/
patch-c9bd8a73-tools-xenstore-add-libdl-dependency-to-libxenstore.patch
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
From c9bd8a73656d7435b1055ee8825823aee995993e Mon Sep 17 00:00:00 2001
From: Juergen Gross <[email protected]>
Date: Wed, 7 Mar 2018 12:03:18 +0100
Subject: [PATCH] tools/xenstore: add libdl dependency to libxenstore
Commit 448c03b3cbe14873ee63 ("tools/xenstore: try to get minimum thread
stack size for watch thread") added a dependency to libdl to
libxenstore.
Add the needed flags to LDLIBS_libxenstore and the pkg-config file of
libxenstore.
Fixes: 448c03b3cbe14873ee63
Signed-off-by: Juergen Gross <[email protected]>
Acked-by: Wei Liu <[email protected]>
[adjust for Xen 4.8]
Signed-off-by: Marek Marczykowski-Górecki <[email protected]>
---
tools/Rules.mk | 3 +++
tools/xenstore/Makefile | 2 ++
tools/xenstore/xenstore.pc.in | 1 +
3 files changed, 6 insertions(+)
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 61515d3063..296b722372 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -149,6 +149,9 @@ CFLAGS_libxenstore = -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude)
SHDEPS_libxenstore =
LDLIBS_libxenstore = $(SHDEPS_libxenstore) $(XEN_XENSTORE)/libxenstore$(libextension)
SHLIB_libxenstore = $(SHDEPS_libxenstore) -Wl,-rpath-link=$(XEN_XENSTORE)
+ifeq ($(CONFIG_Linux),y)
+LDLIBS_libxenstore += -ldl
+endif
CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT)
SHDEPS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 4473cf60b5..69e55e73e5 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -105,6 +105,8 @@ xs.opic: CFLAGS += -DUSE_PTHREAD
ifeq ($(CONFIG_Linux),y)
xs.opic: CFLAGS += -DUSE_DLSYM
libxenstore.so.$(MAJOR).$(MINOR): LDFLAGS += -ldl
+else
+PKG_CONFIG_REMOVE += -ldl
endif
libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
--
2.17.1