[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: lvm2: Fix static linking of dmeventd.
|
From: |
Marius Bakke |
|
Subject: |
01/01: gnu: lvm2: Fix static linking of dmeventd. |
|
Date: |
Tue, 31 Jul 2018 16:33:28 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 0d206dd054b74279838d44029c52a5f7663de189
Author: Marius Bakke <address@hidden>
Date: Tue Jul 31 22:18:51 2018 +0200
gnu: lvm2: Fix static linking of dmeventd.
Fixes a regression introduced in a3ed69b694eab393129348bbabbed8c59bad3772
where dmeventd.static fails to link against libm and breaks "lvm2-static".
* gnu/packages/patches/lvm2-static-link.patch: Patch make.tmpl.in.
---
gnu/packages/patches/lvm2-static-link.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/patches/lvm2-static-link.patch
b/gnu/packages/patches/lvm2-static-link.patch
index 6adf689..eb7849a 100644
--- a/gnu/packages/patches/lvm2-static-link.patch
+++ b/gnu/packages/patches/lvm2-static-link.patch
@@ -12,3 +12,14 @@ and libm via libdevmapper.a.
liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o
lvm2cmd.o
cat $(top_builddir)/lib/liblvm-internal.a > $@
+--- 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@