From 02c4901d893a1b833260a7cbb66b9ad285d7ce39 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 1 Jun 2018 19:18:36 +0100 Subject: [PATCH] build: get clvmd building again --- daemons/clvmd/Makefile.in | 4 ++-- make.tmpl.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemons/clvmd/Makefile.in b/daemons/clvmd/Makefile.in index 47a3411e4..9e096b5b9 100644 --- a/daemons/clvmd/Makefile.in +++ b/daemons/clvmd/Makefile.in @@ -80,9 +80,9 @@ CFLAGS += -fno-strict-aliasing $(EXTRA_EXEC_CFLAGS) INSTALL_TARGETS = \ install_clvmd -clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a +clvmd: $(OBJECTS) $(top_builddir)/lib/liblvm-internal.a $(top_builddir)/device_mapper/libdevice-mapper.a $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) \ - -o clvmd $(OBJECTS) $(LMLIBS) $(LIBS) + -o clvmd $+ $(LMLIBS) $(LIBS) .PHONY: install_clvmd diff --git a/make.tmpl.in b/make.tmpl.in index ad927b001..16a857121 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -58,7 +58,7 @@ PYTHON3 = @PYTHON3@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile LIBS = @LIBS@ -LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) +LIBS += $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) $(RT_LIBS) -lm # Extra libraries always linked with static binaries STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) DEFS += @DEFS@