packages: grubby/grubby-nolibs.patch - no -ldl for libnash
glen
glen at pld-linux.org
Thu May 28 00:00:50 CEST 2009
Author: glen Date: Wed May 27 22:00:50 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- no -ldl for libnash
---- Files affected:
packages/grubby:
grubby-nolibs.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/grubby/grubby-nolibs.patch
diff -u packages/grubby/grubby-nolibs.patch:1.5 packages/grubby/grubby-nolibs.patch:1.6
--- packages/grubby/grubby-nolibs.patch:1.5 Wed May 27 23:59:16 2009
+++ packages/grubby/grubby-nolibs.patch Thu May 28 00:00:45 2009
@@ -11,8 +11,8 @@
test: all
@export TOPDIR=$(TOPDIR)
---- mkinitrd-6.0.86/nash/Makefile~ 2009-05-28 00:09:39.000000000 +0300
-+++ mkinitrd-6.0.86/nash/Makefile 2009-05-28 00:10:56.307732260 +0300
+--- mkinitrd-6.0.86/nash/Makefile 2009-05-28 00:10:56.307732260 +0300
++++ mkinitrd-6.0.86/nash/Makefile 2009-05-28 00:59:35.874404300 +0300
@@ -37,15 +37,12 @@
LDFLAGS += -Wl,-rpath-link,$(TOPDIR)/bdevid:$(TOPDIR)/nash
@@ -23,7 +23,7 @@
-# We need to link against libgcc_s directly, or it'll /dlopen() it during
-# backtrace()! This is not teh way!!!1!!!one!!!.
-nash_LIBS += -lgcc_s
-+nash_LIBS += -ldevmapper -lparted -lblkid -ldl
++nash_LIBS += -ldevmapper -lparted -lblkid
+nash_prog_LIBS = -lnash -lresolv -lelf -lpopt -lbdevid
+nash_prog_LIBS += $(shell pkg-config --libs libnl-1)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grubby/grubby-nolibs.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list