2016-11-22 20:38:40 +00:00
|
|
|
Fix static linking of 'lvm.static', which indirectly depend on libpthread
|
2017-05-11 19:30:35 +00:00
|
|
|
and libm via libdevmapper.a.
|
2016-11-22 20:38:40 +00:00
|
|
|
|
|
|
|
|
--- LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:15.521045149 +0100
|
|
|
|
|
+++ LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:24.085082767 +0100
|
|
|
|
|
@@ -148,7 +148,7 @@ endif
|
|
|
|
|
|
|
|
|
|
lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
|
|
|
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
|
|
|
|
|
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
|
2017-05-11 19:30:35 +00:00
|
|
|
+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(M_LIBS)
|
2016-11-22 20:38:40 +00:00
|
|
|
|
|
|
|
|
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
|
|
|
|
|
cat $(top_builddir)/lib/liblvm-internal.a > $@
|
2018-07-31 20:18:51 +00:00
|
|
|
--- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200
|
|
|
|
|
+++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200
|
|
|
|
|
@@ -53,7 +53,7 @@
|
|
|
|
|
|
|
|
|
|
LIBS = @LIBS@
|
|
|
|
|
# Extra libraries always linked with static binaries
|
|
|
|
|
-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
|
|
|
|
|
+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS)
|
|
|
|
|
DEFS += @DEFS@
|
|
|
|
|
# FIXME set this only where it's needed, not globally?
|
|
|
|
|
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
|
