packages: grubby/grubby-nolibs.patch - bdevid without -ldl

[glen]

Author: glen                         Date: Wed May 27 21:56:04 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bdevid without -ldl

---- Files affected:
packages/grubby:
   grubby-nolibs.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/grubby/grubby-nolibs.patch
diff -u packages/grubby/grubby-nolibs.patch:1.3 packages/grubby/grubby-nolibs.patch:1.4
--- packages/grubby/grubby-nolibs.patch:1.3	Wed May 27 23:42:03 2009
+++ packages/grubby/grubby-nolibs.patch	Wed May 27 23:55:59 2009
@@ -7,7 +7,7 @@
 -grubby_LIBS = -lnash -lbdevid
 -grubby_LIBS += -lparted -lblkid -luuid -lpopt -ldevmapper -lselinux -lsepol
 -grubby_LIBS += $(shell pkg-config --libs libdhcp glib-2.0)
-+grubby_LIBS = -lnash
++grubby_LIBS = -lnash -lbdevid -lpopt
  
  test: all
  	@export TOPDIR=$(TOPDIR)
@@ -33,15 +33,15 @@
  
  $(libnash_OBJECTS) :: CFLAGS += -fPIC
  
---- mkinitrd-6.0.86/bdevid/Makefile	2009-05-28 00:26:07.290963805 +0300
-+++ mkinitrd-6.0.86/bdevid/Makefile	2009-05-28 00:39:22.110658013 +0300
-@@ -21,13 +21,12 @@
+--- mkinitrd-6.0.86/bdevid/Makefile	2009-05-28 00:52:51.344197087 +0300
++++ mkinitrd-6.0.86/bdevid/Makefile	2009-05-28 00:53:26.008010849 +0300
+@@ -21,13 +21,11 @@
  export TOPDIR
  
  bdevid_OBJECTS = bdevid.o module.o probe.o sysfs.o probelib.o
-+bdevid_OBJECTS += ../nash/wrap.o
- bdevid_LIBS := -L. -L$(TOPDIR)/nash -ldl
+-bdevid_LIBS := -L. -L$(TOPDIR)/nash -ldl
 -bdevid_LIBS += -lnash -lparted -lblkid -luuid -ldevmapper -lselinux -lsepol
++bdevid_OBJECTS += ../nash/wrap.o
  
  bdevidprobe_OBJECTS = probelib.o
  
@@ -50,7 +50,7 @@
  
  MODULES = scsi ata usb
  OBJECTS = $(bdevid_OBJECTS)
-@@ -45,14 +44,16 @@
+@@ -45,16 +43,18 @@
  LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/nash:$(TOPDIR)/bdevid
  LDFLAGS += -L$(TOPDIR)/nash -L$(TOPDIR)/bdevid
  
@@ -67,8 +67,11 @@
 +libbdevid.so: libbdevid.so.$(VERSION)
 +
  libbdevid.so.$(VERSION) : $(bdevid_OBJECTS)
- 	$(CC) $(LDFLAGS) -shared -Wl,-soname="$(shell basename $@)" -o $@ $(bdevid_OBJECTS) $(bdevid_LIBS)
+-	$(CC) $(LDFLAGS) -shared -Wl,-soname="$(shell basename $@)" -o $@ $(bdevid_OBJECTS) $(bdevid_LIBS)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname="$(shell basename $@)" -o $@ $(bdevid_OBJECTS)
  
+ libbdevidprobe.a : $(bdevidprobe_OBJECTS)
+ 	$(AR) crs $@ $^
 --- mkinitrd-6.0.86/bdevid/python/Makefile~	2009-05-28 00:27:36.000000000 +0300
 +++ mkinitrd-6.0.86/bdevid/python/Makefile	2009-05-28 00:27:55.486773297 +0300
 @@ -34,7 +34,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-nolibs.patch?r1=1.3&r2=1.4&f=u