X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=lvm2-diet.patch;h=cece1b84dde818817ca75f17702a5df0fec25527;hb=2008d00a7078fd2e4ae36a62208e15bc1c883b15;hp=1799ebc8ac594cdb0da5c572e1444ad60a00e315;hpb=f898c9f5078ef79c7356b63b78cdcc6d06a00634;p=packages%2Flvm2.git

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index 1799ebc..cece1b8 100644
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -126,25 +126,25 @@
  /* FIXME Unused so far */
  #undef HAVE_SYS_STATVFS_H
 
---- LVM2.2.02.105/tools/Makefile.in.orig	2014-01-26 18:33:51.531497416 +0100
-+++ LVM2.2.02.105/tools/Makefile.in	2014-01-26 19:14:42.264728615 +0100
-@@ -127,20 +127,20 @@
+--- LVM2.2.02.149/tools/Makefile.in.orig	2016-04-05 22:05:48.151965546 +0200
++++ LVM2.2.02.149/tools/Makefile.in	2016-04-05 22:16:22.108605605 +0200
+@@ -128,12 +128,12 @@
  CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
  
  dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
 -	$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
-+	$(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm $(EXTRA_EXEC_LDFLAGS) $(LDFLAGS) \
++	$(CC) $(CFLAGS) -L$(interfacebuilddir) -L$(top_builddir)/libdm $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) \
  	      -o $@ dmsetup.o -ldevmapper $(LIBS)
  
  dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
 -	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
--	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
+-	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
 +	$(CC) $(CFLAGS) -static -L$(interfacebuilddir) $(LDFLAGS) \
-+	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
++	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
  
  all: device-mapper
  
- CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
+@@ -141,7 +141,7 @@
  CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
@@ -153,7 +153,7 @@
  		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
  
  ifeq ("@BUILD_LVMETAD@", "yes")
-@@ -148,7 +148,7 @@
+@@ -150,7 +150,7 @@
  
  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
  	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \