diff options
| author | Leo Famulari <leo@famulari.name> | 2016-11-23 22:24:52 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-11-23 22:24:52 -0500 |
| commit | 2ac7d54616819c65405ea27260dbff462160f290 (patch) | |
| tree | 4c82001f0855ebab05ab342e342a680c533b9bf9 /gnu/packages/patches/lvm2-static-link.patch | |
| parent | 61320932edb42e78fb377b5d11cd6ecb32e2f9e6 (diff) | |
| parent | 1c9f78eca1f7e169562abaaa882fd94d845208af (diff) | |
| download | guix-2ac7d54616819c65405ea27260dbff462160f290.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/lvm2-static-link.patch')
| -rw-r--r-- | gnu/packages/patches/lvm2-static-link.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gnu/packages/patches/lvm2-static-link.patch b/gnu/packages/patches/lvm2-static-link.patch new file mode 100644 index 0000000000..b4b1dd92e1 --- /dev/null +++ b/gnu/packages/patches/lvm2-static-link.patch @@ -0,0 +1,14 @@ +Fix static linking of 'lvm.static', which indirectly depend on libpthread +via libdevmapper.a. + +--- 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) ++ $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) + + liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o + cat $(top_builddir)/lib/liblvm-internal.a > $@ |