aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/lvm2-static-link.patch
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-11-22 21:38:40 +0100
committerLudovic Courtès <ludo@gnu.org>2016-11-22 22:59:31 +0100
commit01f94cca19ebd843d6a518530f8acc4fc61b116b (patch)
treeea64e64d75da4ccb29ed5eeda79bcc03657d9d91 /gnu/packages/patches/lvm2-static-link.patch
parent10da75dff8cac41658b6a2eaf8cfeae691242a28 (diff)
downloadguix-01f94cca19ebd843d6a518530f8acc4fc61b116b.tar
guix-01f94cca19ebd843d6a518530f8acc4fc61b116b.tar.gz
gnu: Add 'lvm2-static'.
* gnu/packages/patches/lvm2-static-link.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/linux.scm (lvm2)[source](patches): New field. (lvm2-static): New variable.
Diffstat (limited to 'gnu/packages/patches/lvm2-static-link.patch')
-rw-r--r--gnu/packages/patches/lvm2-static-link.patch14
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 > $@