- updated to 2.02.162, partial PLD merge (patches)

[packages/lvm2.git] / lvm2-diet.patch

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index 8ca191f8e5947018047d238bf7339cc2245037ab..cece1b84dde818817ca75f17702a5df0fec25527 100644 (file)
--- 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
-@@ -128,20 +128,19 @@
+--- 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 $(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")
-@@ -150,7 +149,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 $@ \