summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-20 20:59:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-20 20:59:40 +0000
commitde45c75915c855ad680dca15565c0301b869c426 (patch)
tree8150d6e0a80f91a38feede44a596ce253b4c358b
parent62de43971065751431c7781db9b4cabaf7bf366b (diff)
hotplug2: get rid of the unnecessary reference to libdl as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18106 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hotplug2/patches/110-static_worker.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/package/hotplug2/patches/110-static_worker.patch b/package/hotplug2/patches/110-static_worker.patch
index 76471d59c0..453a52d542 100644
--- a/package/hotplug2/patches/110-static_worker.patch
+++ b/package/hotplug2/patches/110-static_worker.patch
@@ -26,7 +26,7 @@
DESTDIR=
-@@ -13,13 +30,15 @@ all: $(BINS)
+@@ -13,13 +30,16 @@ all: $(BINS)
install:
$(INSTALL_BIN) $(BINS) $(DESTDIR)/sbin/
@@ -46,23 +46,24 @@
+ CFLAGS += -DSTATIC_WORKER=1
+else
+ CFLAGS += $(FPIC)
++ LDFLAGS += -ldl
+endif
+
--- a/common.mak
+++ b/common.mak
-@@ -1,8 +1,11 @@
+@@ -1,7 +1,10 @@
# vim:set sw=8 nosta:
-CFLAGS=-Os -Wall -g -fPIC
+-LDFLAGS=-g -ldl
+COPTS=-Os -Wall -g
- LDFLAGS=-g -ldl
-
++LDFLAGS=-g
++
+CFLAGS=$(COPTS)
+FPIC=-fPIC
-+
+
INSTALL=install -c -m 644
INSTALL_BIN=install -c -m 755
-
--- a/workers/loader.c
+++ b/workers/loader.c
@@ -1,5 +1,23 @@