packages: lvm2/lvm2-diet.patch, lvm2/lvm2.spec - dietlibc needs -lcompat fo...

[arekm]

Author: arekm                        Date: Tue May 18 11:48:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dietlibc needs -lcompat for getline

---- Files affected:
packages/lvm2:
   lvm2-diet.patch (1.4 -> 1.5) , lvm2.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: packages/lvm2/lvm2-diet.patch
diff -u packages/lvm2/lvm2-diet.patch:1.4 packages/lvm2/lvm2-diet.patch:1.5
--- packages/lvm2/lvm2-diet.patch:1.4	Tue May 18 13:34:13 2010
+++ packages/lvm2/lvm2-diet.patch	Tue May 18 13:48:49 2010
@@ -161,3 +161,14 @@
  
  lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
 
+--- LVM2.2.02.65/tools/Makefile.in~	2010-05-18 13:39:46.797633173 +0200
++++ LVM2.2.02.65/tools/Makefile.in	2010-05-18 13:46:01.629690313 +0200
+@@ -137,7 +137,7 @@
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+-	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
++	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) $(DIETLIBC_LIBS)
+ 
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
+ 	cat $(top_builddir)/lib/liblvm-internal.a > $@

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.148 packages/lvm2/lvm2.spec:1.149
--- packages/lvm2/lvm2.spec:1.148	Tue May 18 13:34:13 2010
+++ packages/lvm2/lvm2.spec	Tue May 18 13:48:49 2010
@@ -240,7 +240,7 @@
 %{__make} -j1 -C include
 %{__make} -j1 -C lib LIB_SHARED= VERSIONED_SHLIB=
 %{__make} -j1 -C libdm LIB_SHARED= VERSIONED_SHLIB=
-%{__make} -j1 -C tools dmsetup.static lvm.static
+%{__make} -j1 -C tools dmsetup.static lvm.static DIETLIBC_LIBS="-lcompat"
 mv -f tools/lvm.static initrd-lvm
 mv -f tools/dmsetup.static initrd-dmsetup
 %{?with_dietlibc:mv -f libdm/ioctl/libdevmapper.a diet-libdevmapper.a}
@@ -368,6 +368,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2010/05/18 11:48:49  arekm
+- dietlibc needs -lcompat for getline
+
 Revision 1.148  2010/05/18 11:34:13  arekm
 - up to 2.02.64 but no initrd for now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2-diet.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.148&r2=1.149&f=u