| 123456789101112131415161718192021222324252627282930313233 |
- 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@
|
