- updated to 2.02.140

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

diff --git a/lvm2-diet.patch b/lvm2-diet.patch
index be3c96b719674eda513999e69cac0a4bbeef2d10..8ca191f8e5947018047d238bf7339cc2245037ab 100644 (file)
--- a/lvm2-diet.patch
+++ b/lvm2-diet.patch
@@ -13,19 +13,6 @@
  #ifdef INTL_PACKAGE
        bindtextdomain(INTL_PACKAGE, LOCALEDIR);
  #endif
---- LVM2.2.02.45/lib/locking/file_locking.c    2008-11-12 10:30:52.000000000 +0100
-+++ LVM2.2.02.45-diet/lib/locking/file_locking.c       2009-03-18 12:18:52.000000000 +0100
-@@ -30,6 +30,10 @@
- #include <fcntl.h>
- #include <signal.h>
- 
-+#ifdef __dietlibc__
-+typedef void (*sig_t) (int);
-+#endif
-+
- struct lock_list {
-       struct dm_list list;
-       int lf;
 --- LVM2.2.02.45/libdm/libdevmapper.h  2008-11-04 16:07:45.000000000 +0100
 +++ LVM2.2.02.45-diet/libdm/libdevmapper.h     2009-03-18 12:17:27.000000000 +0100
 @@ -160,6 +160,10 @@
@@ -141,8 +128,8 @@
 
 --- 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,19 +127,19 @@
- CFLAGS_dmsetup.o += $(EXTRA_EXEC_CFLAGS)
+@@ -128,20 +128,19 @@
+ 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 \
@@ -151,13 +138,14 @@
  
  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 $(STATIC_LIBS) $(LIBS) $(PTHREAD_LIBS) $(DIETLIBC_LIBS)
  all: device-mapper
  
  CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
+ CFLAGS_lvmcmdline.o += $(VALGRIND_CFLAGS)
  
  lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
 -      $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
@@ -165,7 +153,7 @@
                $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
  
  ifeq ("@BUILD_LVMETAD@", "yes")
-@@ -148,7 +148,7 @@
+@@ -150,7 +149,7 @@
  
  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
        $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \