Commit | Line | Data |
---|---|---|
01f94cca | 1 | Fix static linking of 'lvm.static', which indirectly depend on libpthread |
2d4deb5d | 2 | and libm via libdevmapper.a. |
01f94cca LC |
3 | |
4 | --- LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:15.521045149 +0100 | |
5 | +++ LVM2.2.02.166/tools/Makefile.in 2016-11-22 21:31:24.085082767 +0100 | |
57bd483f MB |
6 | @@ -137,7 +137,7 @@ |
7 | lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) | |
8 | @echo " [CC] $@" | |
9 | $(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ $+ \ | |
10 | - $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) | |
11 | + $(DMEVENT_LIBS) $(STATIC_LIBS) $(LVMLIBS) $(PTHREAD_LIBS) | |
01f94cca LC |
12 | |
13 | liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o | |
57bd483f | 14 | @echo " [AR] $@" |
0d206dd0 MB |
15 | --- a/make.tmpl.in 2018-07-31 22:00:39.969983104 +0200 |
16 | +++ b/make.tmpl.in 2018-07-31 22:00:58.467613682 +0200 | |
57bd483f | 17 | @@ -63,7 +63,7 @@ |
0d206dd0 | 18 | |
57bd483f | 19 | LIBS += @LIBS@ $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) $(M_LIBS) |
0d206dd0 MB |
20 | # Extra libraries always linked with static binaries |
21 | -STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) | |
22 | +STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(M_LIBS) | |
23 | DEFS += @DEFS@ | |
24 | # FIXME set this only where it's needed, not globally? | |
25 | CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ | |
57bd483f MB |
26 | --- a/libdm/make.tmpl.in 2018-12-18 15:22:34.000000000 +0100 |
27 | +++ b/libdm/make.tmpl.in 2019-01-29 21:45:33.637345799 +0100 | |
28 | @@ -57,7 +57,7 @@ | |
29 | LIBS = @LIBS@ | |
30 | LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm | |
31 | # Extra libraries always linked with static binaries | |
32 | -STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) | |
33 | +STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(PTHREAD_LIBS) $(M_LIBS) | |
34 | DEFS += @DEFS@ | |
35 | # FIXME set this only where it's needed, not globally? | |
36 | CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |