blob: 594d60617259113801a880cbaf402bfb5d510a41 (
plain)
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
|
Make sure that libdm usage always brings in pthread libraries, both in
pkgconfig and during manual build.
--- tools/Makefile.in
+++ tools/Makefile.in
@@ -87,6 +87,7 @@
INSTALL_LVM_TARGETS += install_tools_static
INSTALL_DMSETUP_TARGETS += install_dmsetup_static
INSTALL_CMDLIB_TARGETS += install_cmdlib_static
+ STATIC_LIBS += @PTHREAD_LIBS@
endif
LVMLIBS = $(LVMINTERNAL_LIBS)
@@ -118,6 +119,10 @@
include $(top_builddir)/make.tmpl
+ifeq ("@STATIC_LINK@", "yes")
+ STATIC_LIBS += @PTHREAD_LIBS@
+endif
+
device-mapper: $(TARGETS_DM)
CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
--- libdm/libdevmapper.pc.in
+++ libdm/libdevmapper.pc.in
@@ -8,4 +8,5 @@
Version: @DM_LIB_PATCHLEVEL@
Cflags: -I${includedir}
Libs: -L${libdir} -ldevmapper
+Libs.private: -L${libdir} @PTHREAD_LIBS@
Requires.private: @SELINUX_PC@ @UDEV_PC@
|
GitWeb
