067fca671604078f944906e5660f330c8f1ae6d7
[openwrt/svn-archive/archive.git] / ipv6 / dibbler / patches / 001-uclibcxx.patch
1 Index: dibbler-0.6.1/Makefile
2 ===================================================================
3 --- dibbler-0.6.1.orig/Makefile 2008-03-12 13:27:35.000000000 +0100
4 +++ dibbler-0.6.1/Makefile 2008-03-12 13:27:36.000000000 +0100
5 @@ -39,7 +39,7 @@
6
7 $(CLIENTBIN): libposlib includes commonlibs clntlibs $(MISC)/DHCPClient.o $(CLIENT)
8 @echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
9 - $(CXX) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
10 + $(CXXLD) $(CLNT_LDFLAGS) $(OPTS) $(CLNTLINKOPTS) -o $@ $(MISC)/DHCPClient.o $(CLIENT) \
11 -L$(MISC) -lMisc \
12 -L$(ADDRMGR) -lAddrMgr \
13 -L$(CLNTADDRMGR) -lClntAddrMgr \
14 @@ -57,7 +57,8 @@
15 -L$(MESSAGES) -lMsg \
16 -lClntOptions -lOptions -lLowLevel \
17 -L$(MISC) -lMisc \
18 - -L$(POSLIB) $(CLNTPOSLIB)
19 + -L$(POSLIB) $(CLNTPOSLIB) \
20 + $(CLNT_LIBS)
21
22 ifndef MOD_CLNT_DISABLE_DNSUPDATE
23 CLNTPOSLIB=-lposlib
24 @@ -67,7 +68,7 @@
25
26 $(SERVERBIN): libposlib includes commonlibs srvlibs $(MISC)/DHCPServer.o $(SERVER)
27 @echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
28 - $(CXX) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER) \
29 + $(CXXLD) $(SRV_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPServer.o $(SERVER) \
30 -L$(SRVADDRMGR) -lSrvAddrMgr \
31 -L$(ADDRMGR) -lAddrMgr \
32 -L$(LOWLEVEL) \
33 @@ -88,7 +89,8 @@
34 -L$(MISC) -lMisc \
35 -L$(LOWLEVEL) -lLowLevel \
36 -L$(IFACEMGR) -lIfaceMgr \
37 - -L$(POSLIB) $(SRVPOSLIB)
38 + -L$(POSLIB) $(SRVPOSLIB) \
39 + $(SRV_LIBS)
40
41 ifndef MOD_SRV_DISABLE_DNSUPDATE
42 SRVPOSLIB=-lposlib
43 @@ -98,7 +100,7 @@
44
45 $(RELAYBIN): poslib-configure includes commonlibs relaylibs $(MISC)/DHCPRelay.o $(RELAY)
46 @echo "[LINK ] $(SUBDIR)/$@ ($(LINKPRINT))"
47 - $(CXX) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY) \
48 + $(CXXLD) $(REL_LDFLAGS) $(OPTS) -I $(INCDIR) $(SRVLINKOPTS) -o $@ $(MISC)/DHCPRelay.o $(RELAY) \
49 -L$(RELTRANSMGR) -lRelTransMgr \
50 -L$(RELCFGMGR) -lRelCfgMgr \
51 -L$(RELIFACEMGR) -lRelIfaceMgr \
52 @@ -111,7 +113,8 @@
53 -L$(MESSAGES) -lMsg \
54 -L$(MISC) -lMisc \
55 -L$(OPTIONS) -lOptions \
56 - -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions
57 + -lMisc -lIfaceMgr -lLowLevel -lRelTransMgr -lRelCfgMgr -lRelMsg -lRelOptions -lOptions \
58 + $(SRV_LIBS)
59
60 objs: includes
61 @for dir in $(COMMONSUBDIRS); do \
62 Index: dibbler-0.6.1/Makefile.inc
63 ===================================================================
64 --- dibbler-0.6.1.orig/Makefile.inc 2008-03-12 13:27:35.000000000 +0100
65 +++ dibbler-0.6.1/Makefile.inc 2008-03-12 13:27:36.000000000 +0100
66 @@ -1,5 +1,6 @@
67 # === used tools ===
68 CXX ?= g++
69 +CXXLD ?= $(CXX)
70 CC ?= gcc
71 FLEX = flex
72 BISONPP = $(PREFIX)/bison++/bison++ -S $(PREFIX)/bison++/bison.cc -H $(PREFIX)/bison++/bison.h